From cvs at intevation.de  Sun Jan  1 22:20:26 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  1 Jan 2006 22:20:26 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog, 1.28, 1.29 kolab_bootstrap.in,
	1.12, 1.13 
Message-ID: <20060101212026.6D9481006BE@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog kolab_bootstrap.in 
Log Message:
* dist_conf/debian: added (provided by  Benoit Mortier)
* dist_conf/suse, dist_conf/kolab, dist_conf/common: added backupdir
* kolab_bootstrap.in: replaced $sysconfdir/kolab/backup with @backupdir@
  Added webserver_web_prefix to the url that is to be used to reach
  the admin page



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- ChangeLog	31 Dec 2005 08:38:18 -0000	1.28
+++ ChangeLog	1 Jan 2006 21:20:24 -0000	1.29
@@ -1,3 +1,11 @@
+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
+	* kolab_bootstrap.in: replaced $sysconfdir/kolab/backup with @backupdir@
+	  Added webserver_web_prefix to the url that is to be used to reach
+	  the admin page
+
 2005-12-30 Richard Bos <richard at radoeka.nl>
 	* configure.ac: cosmetic change.  Change --enable-openpkg
 	  into --with-openpkg

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- kolab_bootstrap.in	30 Dec 2005 10:25:21 -0000	1.12
+++ kolab_bootstrap.in	1 Jan 2006 21:20:24 -0000	1.13
@@ -215,7 +215,7 @@
   }
   print "Creating backup of old configuration (LDAP, kolab.conf and certificates\n";
   my $epochseconds = timelocal(gmtime);
-  my $backupdir="@sysconfdir@/kolab/backup".$epochseconds;
+  my $backupdir="@backupdir@/backup".$epochseconds;
   mkdir($backupdir,0700) || die "cannot mkdir : $!";
   print "creating backup of LDAP repository\n";
   system("cp -pRP \"@ldapserver_dir@\" \"$backupdir/openldap-data\"");
@@ -909,4 +909,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/admin !\n");
+print ("the webinterface https://$fqdn at webserver_web_prefix@/admin !\n");



From cvs at intevation.de  Sun Jan  1 22:20:26 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  1 Jan 2006 22:20:26 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf debian, NONE, 1.1 common, 1.10,
	1.11 kolab, 1.14, 1.15 suse, 1.12, 1.13 
Message-ID: <20060101212026.7021A1006C0@lists.intevation.de>

Author: richard

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

Modified Files:
	common kolab suse 
Added Files:
	debian 
Log Message:
* dist_conf/debian: added (provided by  Benoit Mortier)
* dist_conf/suse, dist_conf/kolab, dist_conf/common: added backupdir
* kolab_bootstrap.in: replaced $sysconfdir/kolab/backup with @backupdir@
  Added webserver_web_prefix to the url that is to be used to reach
  the admin page



--- NEW FILE: debian ---
kolab_usr=root
kolab_grp=root
kolab_musr=root
kolab_mgrp=root
kolab_uid=1002
kolab_gid=1002
restricted_kolab_usr=root
restricted_kolab_grp=root
kolab_rusr=${restricted_kolab_usr}
kolab_rgrp=${restricted_kolab_grp}
kolab_susr=root

BASHELL=/bin/bash
PERL=${bindir}/perl
PHP=${bindir}/php
KOLABRC=${sbindir}/kolab

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

# perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/"
perllib=${libdir}/perl5

amavisd_confdir=${sysconfdir}/amavis/conf.d
amavisd_logfile=${localstatedir}/log/amavis.log
amavisd_home=${localstatedir}/lib//amavis
amavisd_rusr=kolab-r
amavisd_usr=kolab
amavisd_grp=kolab-r

fsl_logfile=${localstatedir}/log/fsl

sysrundir=${localstatedir}/run/amavis

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


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

emailserver_confdir=${sysconfdir}/postfix
emailserver_socket=${libdir}/postfix/lmtp
emailserver_localstatedir=${localstatedir}/spool/postfix
emailserver_logfile=${localstatedir}/log/mail.log
emailserver_sasl_conffile=${libdir}/sasl2/smtpd.conf
emailserver_usr=${kolab_usr}
emailserver_musr=kolab
emailserver_grp=${restricted_kolab_grp}
emailserver_mail_usr=kolab

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

imap_confdir=${sysconfdir}
imap_confperm=0640
imap_usr=cyrus
imap_grp=sasl
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

kolab_statedir=${localstatedir}/kolab
kolab_logdir=${localstatedir}/log/kolab
kolab_pidfile=${sysrundir}/kolab.pid
kolab_mailboxuiddb=${kolab_statedir}/mailbox-uidcache.db

ldapserver_statedir=${localstatedir}/lib/ldap
ldapserver_dir=${localstatedir}/lib/ldap
ldapserver_replogfile=${localstatedir}/log/ldap-replicalog
ldapserver_argsfile=${sysrundir}/slapd.args
ldapserver_logfile=${localstatedir}/log/syslog
ldapserver_pidfile=${sysrundir}/slapd.pid
ldapserverslurpd_pidfile=${sysrundir}/slurpd.pid
ldapserver_schemadir=${sysconfdir}/ldap/schema
ldapserver_confdir=${sysconfdir}/ldap
ldapserver_usr=ldap
ldapserver_grp=ldap

webserver_document_root=/var/www
webserver_cgidir=${webserver_document_root}/cgi-bin
webserver_sessions=${localstatedir}/cache/kolab/httpd_sessions
webserver_logdir=${localstatedir}/log/apache2
webserver_acceptlock=${webserver_logdir}/accept.lock
webserver_runtime_status=${webserver_logdir}/apache_runtime_status
webserver_errorlogfile=${webserver_logdir}/apache-error.log
webserver_accesslogfile=${webserver_logdir}/apache-access.log
webserver_confdir=${sysconfdir}/apache2
webserver_pidfile=${sysrundir}/apache2/apache2.pid
webserver_mime_magicfile=${sysconfdir}/apache2/magic
webserver_mime_typesfile=${sysconfdir}/apache2/mime.types
webserver_sslscache=${sysrundir}/ssl_scache
webserver_sslmutex=${sysrundir}/ssl_mutex
webserver_web_prefix=/kolab
webserver_musr=kolab
webserver_usr=wwwrun
webserver_grp=www

phplibdir=${datadir}/php
phplibdir2=${datadir}/php
phppeardir=${phplibdir}/PEAR

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

resmgr_logfile=${localstatedir}/log/resmgr.log
resmgr_confdir=${sysconfdir}/resmgr
resmgr_filterdir=${localstatedir}/resmgr/filter
resmgr_usr=kolab
resmgr_grp=kolab-n

fbview_logfile=${localstatedir}/resmgr/fbview.log
freebusy_logfile=${localstatedir}/resmgr/freebusy.log
freebusy_cachedir=${webserver_document_root}${webserver_web_prefix}/freebusy/cache

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


Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- common	30 Dec 2005 10:46:27 -0000	1.10
+++ common	1 Jan 2006 21:20:24 -0000	1.11
@@ -22,6 +22,7 @@
 	-e 's,[@]amavisd_logfile[@],$(amavisd_logfile),g' \
 	-e 's,[@]amavisd_rusr[@],$(amavisd_rusr),g' \
 	-e 's,[@]amavisd_usr[@],$(amavisd_usr),g' \
+	-e 's,[@]backupdir[@],$(backupdir),g' \
 	-e 's,[@]clamav_confdir[@],$(clamav_confdir),g' \
 	-e 's,[@]clamav_datadir[@],$(clamav_datadir),g' \
 	-e 's,[@]clamav_grp[@],$(clamav_grp),g' \

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- kolab	30 Dec 2005 10:46:27 -0000	1.14
+++ kolab	1 Jan 2006 21:20:24 -0000	1.15
@@ -161,3 +161,7 @@
 
 graveyard_uidcache=${localstatedir}/kolab/graveyard_uidcache.db
 graveyard_tscache=${localstatedir}/kolab/graveyard_tscache.db
+
+backupdir=${sysconfdir}/kolab
+
+

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- suse	30 Dec 2005 19:31:15 -0000	1.12
+++ suse	1 Jan 2006 21:20:24 -0000	1.13
@@ -135,3 +135,5 @@
 graveyard_uidcache=${localstatedir}/kolab/graveyard_uidcache.db
 graveyard_tscache=${localstatedir}/kolab/graveyard_tscache.db
 
+backupdir=${localstatedir}/adm/backup/kolab
+



From cvs at intevation.de  Sun Jan  1 23:21:21 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  1 Jan 2006 23:21:21 +0100 (CET)
Subject: martin: server/kolabd Makefile,1.9,1.10 
Message-ID: <20060101222121.1CAF91006BE@lists.intevation.de>

Author: martin

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

Modified Files:
	Makefile 
Log Message:
Martin Konold: Issue#1058 Adding support for tar target


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolabd/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile	20 Dec 2005 09:18:50 -0000	1.9
+++ Makefile	1 Jan 2006 22:21:19 -0000	1.10
@@ -8,6 +8,8 @@
 VERSION:=`grep 'm4_define(_VERSION' $(PWD)/$(PACKAGE)/configure.ac|sed 's/m4_define(_VERSION,\(.*\))/\1/'`
 RELEASE:=`date '+%Y%m%d'`
 
+MAKETAR = dist
+
 all:
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(PACKAGE) && ./bootstrap && ./configure --prefix=/kolab --enable-dist=kolab \
@@ -20,3 +22,7 @@
 
 dist: all
 	cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+
+tar:
+	test -d $(MAKETAR)/$(PACKAGE) || mkdir -p $(MAKETAR)/$(PACKAGE)
+	tar -cvj --exclude=CVS --exclude=\*~ --exclude=dist -f $(MAKETAR)/$(PACKAGE)/$(PACKAGE)-$(VERSION)-$(RELEASE).tar.bz2 *



From cvs at intevation.de  Mon Jan  2 20:21:06 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon,  2 Jan 2006 20:21:06 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog, 1.29, 1.30 Makefile.am, 1.11,
	1.12 
Message-ID: <20060102192106.308E41006C6@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Fix bug issue1068, rc.kolabd need to be executable
Thanks Marcus for providing the fix.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- ChangeLog	1 Jan 2006 21:20:24 -0000	1.29
+++ ChangeLog	2 Jan 2006 19:21:03 -0000	1.30
@@ -1,3 +1,9 @@
+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>
 	Patch committed by Richard Bos, see issue1049
 	* dist_conf/debian: added (provided by  Benoit Mortier)
@@ -44,7 +50,10 @@
 
 2005-12-23 Richard Bos <richard at radoeka.nl>
 	* dist_conf/(kolab,suse,gentoo,mandriva}: removed the unused
-	  variables postfix_usr and postfix_grp
+	  variables postfix_usr, postfix_grp, emailserver_imapdir,
+	  emailserver_imapspooldir and emailserver_sievedir
+	* dist_conf/suse: added the right values for: emailserver_socket
+	  emailserver_localstatedir and emailserver_logfile
 
 2005-12-23 Richard Bos <richard at radoeka.nl>
 	* dist_conf/suse: removed the not needed references to the openpkg

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile.am	30 Dec 2005 19:31:15 -0000	1.11
+++ Makefile.am	2 Jan 2006 19:21:03 -0000	1.12
@@ -527,9 +527,9 @@
 	chmod +744 $(DESTDIR)$(sbindir)/kolabd
 	chmod +744 $(DESTDIR)$(sbindir)/kolabconf
 	chmod +744 $(DESTDIR)$(sbindir)/kolabcheckperm
-	chmod +755 $(DESTDIR)$(kolabrcdir)/$(kolabrc_FILE)
 	chmod +755 $(DESTDIR)$(bindir)/kolabpasswd
 if OPENPKG
+	chmod +755 $(DESTDIR)$(kolabrcdir)/$(kolabrc_DATA)
 	chmod +744 $(DESTDIR)$(bindir)/kolab
 endif
 



From cvs at intevation.de  Tue Jan  3 17:12:34 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue,  3 Jan 2006 17:12:34 +0100 (CET)
Subject: bernhard: doc/www/src mirrors.html.m4,1.10,1.11 
Message-ID: <20060103161234.287F51005CE@lists.intevation.de>

Author: bernhard

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

Modified Files:
	mirrors.html.m4 
Log Message:
Changing linjection url as requested by Markus Oliver Markert <email at markus-markert.de> on kolab-devel.


Index: mirrors.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/mirrors.html.m4,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- mirrors.html.m4	22 Dec 2005 10:20:48 -0000	1.10
+++ mirrors.html.m4	3 Jan 2006 16:12:31 -0000	1.11
@@ -15,7 +15,7 @@
 <li>
   <b>Linjection</b><br>
   via
-  <a href="http://web12.austria182.server4free.de/projekte/kolab/">http</a>
+  <a href="http://kolab.linjection.org/">http</a>
 </ul>
 
 <h2>How to become a mirror?</h2>



From cvs at intevation.de  Tue Jan  3 22:12:34 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue,  3 Jan 2006 22:12:34 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog, 1.30, 1.31 Makefile.am, 1.12,
	1.13 
Message-ID: <20060103211234.71B261006C3@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Makefile.am: distribute only the files to be distributed
from the dist_conf directory

To give you an idea of the difference.

This is before the patch:
kolabd-2.0.99/dist_conf/CVS/
kolabd-2.0.99/dist_conf/CVS/Root
kolabd-2.0.99/dist_conf/CVS/Repository
kolabd-2.0.99/dist_conf/CVS/Entries
kolabd-2.0.99/dist_conf/suse
kolabd-2.0.99/dist_conf/Makefile
kolabd-2.0.99/dist_conf/kolab
kolabd-2.0.99/dist_conf/kolab.orig
kolabd-2.0.99/dist_conf/mandriva
kolabd-2.0.99/dist_conf/debian
kolabd-2.0.99/dist_conf/common
kolabd-2.0.99/dist_conf/gentoo
kolabd-2.0.99/dist_conf/Makefile.am
kolabd-2.0.99/dist_conf/Makefile.in
kolabd-2.0.99/dist_conf/suse.orig
kolabd-2.0.99/dist_conf/.#suse.1.5


This is after:
kolabd-2.0.99/dist_conf/suse
kolabd-2.0.99/dist_conf/kolab
kolabd-2.0.99/dist_conf/mandriva
kolabd-2.0.99/dist_conf/debian
kolabd-2.0.99/dist_conf/common
kolabd-2.0.99/dist_conf/gentoo


Just as it should, clean.





Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- ChangeLog	2 Jan 2006 19:21:03 -0000	1.30
+++ ChangeLog	3 Jan 2006 21:12:32 -0000	1.31
@@ -1,3 +1,7 @@
+2006-01-03 Richard Bos <richard at radoeka.nl>
+	* Makefile.am: distribute only the files to be distributed
+	   from the dist_conf directory
+
 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

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile.am	2 Jan 2006 19:21:03 -0000	1.12
+++ Makefile.am	3 Jan 2006 21:12:32 -0000	1.13
@@ -6,6 +6,10 @@
 
 noinst_HEADERS = @PACKAGE at .spec
 
+# Work around to autoconf's deficiencies
+distclean-local:
+	rm -rf $(srcdir)/autom4te*.cache
+
 # is sometimes used in this file
 kolabconfdir = $(sysconfdir)/kolab
 
@@ -510,8 +514,13 @@
 CLEANFILES += rc.kolabd
 EXTRA_DIST += rc.kolabd.in
 
-
-EXTRA_DIST += dist_conf kolabd.spec.in
+EXTRA_DIST += kolabd.spec.in \
+	dist_conf/common \
+	dist_conf/debian \
+	dist_conf/gentoo \
+	dist_conf/kolab \
+	dist_conf/mandriva \
+	dist_conf/suse
 
 install-data-hook:
 	$(mkinstalldirs) -m 755 $(DESTDIR)



From cvs at intevation.de  Tue Jan  3 22:51:03 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue,  3 Jan 2006 22:51:03 +0100 (CET)
Subject: richard: server/perl-kolab ChangeLog,1.6,1.7 Makefile.am,1.7,1.8 
Message-ID: <20060103215103.B53E91006A9@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
distribute only the files to be distributed from the dist_conf directory



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ChangeLog	30 Dec 2005 19:38:45 -0000	1.6
+++ ChangeLog	3 Jan 2006 21:51:01 -0000	1.7
@@ -1,3 +1,7 @@
+2006-01-03 Richard Bos <richard at radoeka.nl>
+	* Makefile.am: distribute only the files to be distributed
+	  from the dist_conf directory
+
 2005-12-30 Richard Bos <richard at radoeka.nl>
 	* Kolab/Makefile.am,
 	  Kolab-Conf/Makefile.am,

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.am	17 Dec 2005 21:45:32 -0000	1.7
+++ Makefile.am	3 Jan 2006 21:51:01 -0000	1.8
@@ -76,7 +76,13 @@
 CLEANFILES += Kolab-Mailer/Mailer.pm
 EXTRA_DIST += Kolab-Mailer/Mailer.pm.in
 
-EXTRA_DIST += dist_conf
 CLEANFILES += perl-kolab.spec
 
-install-data-hook:
+EXTRA_DIST += dist_conf/common \
+	dist_conf/debian \
+	dist_conf/gentoo \
+	dist_conf/kolab \
+	dist_conf/mandriva \
+	dist_conf/suse
+
+



From cvs at intevation.de  Tue Jan  3 22:59:10 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue,  3 Jan 2006 22:59:10 +0100 (CET)
Subject: richard: server/kolabd/kolabd Makefile.am, 1.13, 1.14 ChangeLog, 1.31,
	1.32 
Message-ID: <20060103215910.94FEC1006A9@lists.intevation.de>

Author: richard

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

Modified Files:
	Makefile.am ChangeLog 
Log Message:
The kolabd.spec.in is already distributed without being
specified in the EXTRA_DIST line.
Add a remark that the perl-kolab, kolab-webadmin and
kolab-resource-handlers Makefile.ams must be updated too when
kolabd's Makefile.am is updated for dist_conf sources.
Added a distclean-local rule to remove the directory autom4te.cache



Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile.am	3 Jan 2006 21:12:32 -0000	1.13
+++ Makefile.am	3 Jan 2006 21:59:08 -0000	1.14
@@ -514,8 +514,9 @@
 CLEANFILES += rc.kolabd
 EXTRA_DIST += rc.kolabd.in
 
-EXTRA_DIST += kolabd.spec.in \
-	dist_conf/common \
+# Please update the perl-kolab, kolab-webadmin and kolab-resource-handlers
+# Makefile.ams too when the underneath EXTRA_DIST assignment is altered
+EXTRA_DIST += dist_conf/common \
 	dist_conf/debian \
 	dist_conf/gentoo \
 	dist_conf/kolab \

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- ChangeLog	3 Jan 2006 21:12:32 -0000	1.31
+++ ChangeLog	3 Jan 2006 21:59:08 -0000	1.32
@@ -1,6 +1,12 @@
 2006-01-03 Richard Bos <richard at radoeka.nl>
 	* Makefile.am: distribute only the files to be distributed
-	   from the dist_conf directory
+	  from the dist_conf directory.
+	  The kolabd.spec.in is already distributed without being
+	  specified in the EXTRA_DIST line.
+	  Add a remark that the perl-kolab, kolab-webadmin and
+	  kolab-resource-handlers Makefile.ams must be updated too when
+	  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>
 	Patch committed by Richard Bos



From cvs at intevation.de  Tue Jan  3 23:00:41 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue,  3 Jan 2006 23:00:41 +0100 (CET)
Subject: richard: server/perl-kolab ChangeLog,1.7,1.8 Makefile.am,1.8,1.9 
Message-ID: <20060103220041.A88E11006A9@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Added a distclean-local rule to remove the directory autom4te.cache



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ChangeLog	3 Jan 2006 21:51:01 -0000	1.7
+++ ChangeLog	3 Jan 2006 22:00:39 -0000	1.8
@@ -1,6 +1,7 @@
 2006-01-03 Richard Bos <richard at radoeka.nl>
 	* Makefile.am: distribute only the files to be distributed
 	  from the dist_conf directory
+	  Added a distclean-local rule to remove the directory autom4te.cache
 
 2005-12-30 Richard Bos <richard at radoeka.nl>
 	* Kolab/Makefile.am,

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.am	3 Jan 2006 21:51:01 -0000	1.8
+++ Makefile.am	3 Jan 2006 22:00:39 -0000	1.9
@@ -4,6 +4,10 @@
 @distribution@
 @common@
 
+# Work around to autoconf's deficiencies
+distclean-local:
+	rm -rf $(srcdir)/autom4te*.cache
+
 noinst_HEADERS = @PACKAGE at .spec
 
 perl_kolabdir = $(perllib)



From cvs at intevation.de  Tue Jan  3 23:04:39 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue,  3 Jan 2006 23:04:39 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.13,
	1.14 Makefile.am, 1.29, 1.30 
Message-ID: <20060103220439.836931006B3@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Makefile.am: distribute only the files to be distributed from the
dist_conf directory
Added a distclean-local rule to remove the directory autom4te.cache



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ChangeLog	30 Dec 2005 19:30:00 -0000	1.13
+++ ChangeLog	3 Jan 2006 22:04:37 -0000	1.14
@@ -1,3 +1,8 @@
+2006-01-03 Richard Bos <richard at radoeka.nl>
+	* Makefile.am: distribute only the files to be distributed
+	  from the dist_conf directory
+	  Added a distclean-local rule to remove the directory autom4te.cache
+
 2005-12-30 Richard Bos <richard at radoeka.nl>
 	* Makefile.am: add webserver_web_prefix so the involved files
 	  are installed in the right directory.

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- Makefile.am	30 Dec 2005 19:27:49 -0000	1.29
+++ Makefile.am	3 Jan 2006 22:04:37 -0000	1.30
@@ -4,6 +4,9 @@
 @distribution@
 @common@
 
+distclean-local:
+	rm -rf $(srcdir)/autom4te*.cache
+
 noinst_HEADERS = @PACKAGE at .spec
 
 WSTOPLEVEL_FILES = www/favicon.ico
@@ -190,8 +193,12 @@
         NEWS \
         AUTHORS
 
-EXTRA_DIST += dist_conf
-
+EXTRA_DIST += dist_conf/common \
+	dist_conf/debian \
+	dist_conf/gentoo \
+	dist_conf/kolab \
+	dist_conf/mandriva \
+	dist_conf/suse
 
 php/admin/include/auth.class.php:
 	@$(mkinstalldirs) php/admin/include



From cvs at intevation.de  Tue Jan  3 23:06:59 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue,  3 Jan 2006 23:06:59 +0100 (CET)
Subject: richard: server/kolab-resource-handlers/kolab-resource-handlers
	ChangeLog, 1.8, 1.9 Makefile.am, 1.4, 1.5 
Message-ID: <20060103220659.187681006B3@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Makefile.am: distribute only the files to be distributed from the
dist_conf directory
Added a distclean-local rule to remove the directory autom4te.cache



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ChangeLog	30 Dec 2005 19:27:33 -0000	1.8
+++ ChangeLog	3 Jan 2006 22:06:57 -0000	1.9
@@ -1,3 +1,8 @@
+2006-01-03 Richard Bos <richard at radoeka.nl>
+	* Makefile.am: distribute only the files to be distributed
+	  from the dist_conf directory
+	  Added a distclean-local rule to remove the directory autom4te.cache
+
 2005-12-30 Richard Bos <richard at radoeka.nl>
 	* Makefile.am: add webserver_web_prefix so the involved files
 	  are installed in the right directory.

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.am	30 Dec 2005 19:24:57 -0000	1.4
+++ Makefile.am	3 Jan 2006 22:06:57 -0000	1.5
@@ -4,6 +4,10 @@
 @distribution@
 @common@
 
+# Work around to autoconf's deficiencies
+distclean-local:
+	rm -rf $(srcdir)/autom4te*.cache
+
 noinst_HEADERS = @PACKAGE at .spec
 
 wsfreebusydir = $(webserver_document_root)$(webserver_web_prefix)/freebusy
@@ -78,7 +82,12 @@
 CLEANFILES += resmgr/resmgr.conf
 EXTRA_DIST += resmgr/resmgr.conf.in
 
-EXTRA_DIST += dist_conf
+EXTRA_DIST += dist_conf/common \
+	dist_conf/debian \
+	dist_conf/gentoo \
+	dist_conf/kolab \
+	dist_conf/mandriva \
+	dist_conf/suse
 
 install-data-hook:
 	install -d -m 755 $(DESTDIR)/$(resmgr_filterdir)



From cvs at intevation.de  Wed Jan  4 23:04:01 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed,  4 Jan 2006 23:04:01 +0100 (CET)
Subject: richard: server/kolabd/kolabd configure.ac, 1.6, 1.7 ChangeLog, 1.32,
	1.33 kolab_bootstrap.in, 1.13, 1.14 
Message-ID: <20060104220401.59046101EEA@lists.intevation.de>

Author: richard

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

Modified Files:
	configure.ac ChangeLog kolab_bootstrap.in 
Log Message:
* configure.ac: Added AC_SUBST(WITHOPENPKG)
* dist_conf/common: Added CHKCONFIG, WITHOPENPKG and backupfiles
* dist_conf/suse: Added assignment for backupfiles
* kolab_bootstrap.in: Added one time backup support for configuration
  files that are provided by the distributor
  Removed a redundant @ldapserver_dir@ statement
  Changed removal of *.pem files and the @ldapserver_dir@/* files
  Check the existance of files and directories, before moving
  Change @sysconfdir@/rc.conf for openpkg based distributions


It works very well on my (non openpkg) system.  Please test it on a
openpkg system carefully too!




Index: configure.ac
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/configure.ac,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- configure.ac	30 Dec 2005 19:59:52 -0000	1.6
+++ configure.ac	4 Jan 2006 22:03:59 -0000	1.7
@@ -28,6 +28,13 @@
   esac],[openpkg=true])
 AM_CONDITIONAL(OPENPKG, test x$openpkg = xtrue)
 
+if test "x$openpkg" = "xtrue"; then
+  WITHOPENPKG=yes
+else
+  WITHOPENPKG=no
+fi
+AC_SUBST(WITHOPENPKG)
+
 # Checks for libraries.
 
 # Checks for header files.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- ChangeLog	3 Jan 2006 21:59:08 -0000	1.32
+++ ChangeLog	4 Jan 2006 22:03:59 -0000	1.33
@@ -1,3 +1,14 @@
+2006-01-04 Richard Bos <richard at radoeka.nl>
+	* configure.ac: Added AC_SUBST(WITHOPENPKG)
+	* dist_conf/common: Added CHKCONFIG, WITHOPENPKG and backupfiles
+	* dist_conf/suse: Added assignment for backupfiles
+	* kolab_bootstrap.in: Added one time backup support for configuration
+	  files that are provided by the distributor
+	  Removed a redundant @ldapserver_dir@ statement
+	  Changed removal of *.pem files and the @ldapserver_dir@/* files
+	  Check the existance of files and directories, before moving
+	  Change @sysconfdir@/rc.conf for openpkg based distributions
+
 2006-01-03 Richard Bos <richard at radoeka.nl>
 	* Makefile.am: distribute only the files to be distributed
 	  from the dist_conf directory.

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- kolab_bootstrap.in	1 Jan 2006 21:20:24 -0000	1.13
+++ kolab_bootstrap.in	4 Jan 2006 22:03:59 -0000	1.14
@@ -213,19 +213,38 @@
     print "Bootstrapping aborted - not creating new configuration\n";
     exit 0;
   }
-  print "Creating backup of old configuration (LDAP, kolab.conf and certificates\n";
+  print "Creating backup of old configuration (LDAP, kolab.conf and certificates)\n";
+
+  my $backupfiles = "@backupfiles@";
+  if ($backupfiles ne "" && ! -s "@backupdir@/kolab_backup-orig.tar.bz2") {
+    # Do an one time backup.  This is to backup the original configuration
+    # files that were configured by user.  The one time back is marked with
+    # orig.
+    system("tar cjPf @backupdir@/kolab_backup-orig.tar.bz2 $backupfiles");
+    print "The orginal configuration files have been backed up to:\n";
+    print "  @backupdir@/kolab_backup-orig.tar.bz2\n"
+  }
   my $epochseconds = timelocal(gmtime);
   my $backupdir="@backupdir@/backup".$epochseconds;
   mkdir($backupdir,0700) || die "cannot mkdir : $!";
+
   print "creating backup of LDAP repository\n";
   system("cp -pRP \"@ldapserver_dir@\" \"$backupdir/openldap-data\"");
-  system("rm -f \"@ldapserver_dir@/*\"");
+
   print "creating backup of CA data\n";
-  system("mv \"@sysconfdir@/kolab/ca\" \"$backupdir\"");
-  system("mv \"@sysconfdir@/kolab/*.pem\" \"$backupdir\"");
-  system("mv \"$kolab_config\" \"$backupdir\"");
+  if (-d "@sysconfdir@/kolab/ca") {
+    system("mv \"@sysconfdir@/kolab/ca\" $backupdir");
+  }
+
+  system("cd \"@sysconfdir@/kolab\"; mv *.pem $backupdir");
+
+  if (-f $kolab_config) {
+    system("mv \"$kolab_config\" $backupdir");
+  }
+
   print "Cleaning up LDAP\n";
-  system("rm -f \"@ldapserver_dir@/*\"");
+  system("cd \"@ldapserver_dir@\"; rm -f *");
+
 } else {
   print "LDAP repository is empty - assuming fresh install\n";
 }
@@ -605,18 +624,23 @@
 
    print "Create initial config files for postfix, apache, proftpd, cyrus imap, saslauthd\n";
 
-   my $cfg;
-   open(FH, "<@sysconfdir@/rc.conf") || die;
-   $cfg .= $_ while (<FH>);
-   close(FH);
+   if ("@WITHOPENPKG@" eq "yes") {
+     # @sysconfdir@/rc.conf can be used to change the startup behaviour
+     # of programs, that have been installed with openpkg. On non openpkg
+     # this could be done with e.g. /etc/sysconfig/ldap.
+     my $cfg;
+     open(FH, "<@sysconfdir@/rc.conf") || die;
+     $cfg .= $_ while (<FH>);
+     close(FH);
 
-   $cfg =~ s/\n((openldap_url|sasl_authmech)\S*=[^\n]*)/#$1\n/sg;
-   $cfg .= "openldap_url=\"ldap:// ldaps://\"\nsasl_authmech=\"ldap\"\n";
+     $cfg =~ s/\n((openldap_url|sasl_authmech)\S*=[^\n]*)/#$1\n/sg;
+     $cfg .= "openldap_url=\"ldap:// ldaps://\"\nsasl_authmech=\"ldap\"\n";
 
-   open(FH, ">@sysconfdir@/rc.conf") || die;
-   print FH $cfg;
-   close(FH);
-   undef $cfg;
+     open(FH, ">@sysconfdir@/rc.conf") || die;
+     print FH $cfg;
+     close(FH);
+     undef $cfg;
+   }
 
    #print " running @sysconfdir@/kolab/kolab -v -o -l$ldap_uri\n";
    print "running @sbindir@/kolabconf -n\n";



From cvs at intevation.de  Wed Jan  4 23:04:01 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed,  4 Jan 2006 23:04:01 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf common, 1.11, 1.12 suse, 1.13,
	1.14 
Message-ID: <20060104220401.5C5F2101EEC@lists.intevation.de>

Author: richard

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

Modified Files:
	common suse 
Log Message:
* configure.ac: Added AC_SUBST(WITHOPENPKG)
* dist_conf/common: Added CHKCONFIG, WITHOPENPKG and backupfiles
* dist_conf/suse: Added assignment for backupfiles
* kolab_bootstrap.in: Added one time backup support for configuration
  files that are provided by the distributor
  Removed a redundant @ldapserver_dir@ statement
  Changed removal of *.pem files and the @ldapserver_dir@/* files
  Check the existance of files and directories, before moving
  Change @sysconfdir@/rc.conf for openpkg based distributions


It works very well on my (non openpkg) system.  Please test it on a
openpkg system carefully too!




Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- common	1 Jan 2006 21:20:24 -0000	1.11
+++ common	4 Jan 2006 22:03:59 -0000	1.12
@@ -11,11 +11,13 @@
 	-e 's,[@]phplibdir2[@],$(phplibdir2),g' \
 	-e 's,[@]phppeardir[@],$(phppeardir),g' \
 	-e 's,[@]BASH[@],$(BASHELL),g' \
+	-e 's,[@]CHKCONFIG[@],$(CHKCONFIG),g' \
+	-e 's,[@]KOLABRC[@],$(KOLABRC),g' \
 	-e 's,[@]PERL[@],$(PERL),g' \
 	-e 's,[@]PHP[@],$(PHP),g' \
-	-e 's,[@]KOLABRC[@],$(KOLABRC),g' \
-	-e 's,[@]restricted_kolab_grp[@],$(restricted_kolab_grp),g' \
 	-e 's,[@]VERSION[@],$(VERSION),g' \
+	-e 's,[@]WITHOPENPKG[@],$(WITHOPENPKG),g' \
+	-e 's,[@]restricted_kolab_grp[@],$(restricted_kolab_grp),g' \
 	-e 's,[@]amavisd_confdir[@],$(amavisd_confdir),g' \
 	-e 's,[@]amavisd_grp[@],$(amavisd_grp),g' \
 	-e 's,[@]amavisd_home[@],$(amavisd_home),g' \
@@ -23,6 +25,7 @@
 	-e 's,[@]amavisd_rusr[@],$(amavisd_rusr),g' \
 	-e 's,[@]amavisd_usr[@],$(amavisd_usr),g' \
 	-e 's,[@]backupdir[@],$(backupdir),g' \
+	-e 's,[@]backupfiles[@],$(backupfiles),g' \
 	-e 's,[@]clamav_confdir[@],$(clamav_confdir),g' \
 	-e 's,[@]clamav_datadir[@],$(clamav_datadir),g' \
 	-e 's,[@]clamav_grp[@],$(clamav_grp),g' \

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- suse	1 Jan 2006 21:20:24 -0000	1.13
+++ suse	4 Jan 2006 22:03:59 -0000	1.14
@@ -11,9 +11,9 @@
 kolab_susr=root
 
 BASHELL=/bin/bash
+KOLABRC=${sbindir}/kolab
 PERL=${bindir}/perl
 PHP=${bindir}/php
-KOLABRC=${sbindir}/kolab
 
 kolab_rcdir=${sysconfdir}/init.d
 pkgdocdir=${datadir}/doc/packages/kolab
@@ -137,3 +137,17 @@
 
 backupdir=${localstatedir}/adm/backup/kolab
 
+# One time backup files.  These original distribution configuration files
+# will be backed up once, just before kolab is about to change those files.
+backupfiles=/etc/amavisd.conf \
+	/etc/cyrus.conf \
+	/etc/imapd.conf \
+	/etc/openldap/slapd.conf \
+	/etc/postfix/main.cf \
+	/etc/postfix/master.cf \
+	/usr/lib/sasl2/smtpd.conf \
+	/etc/postfix/transport \
+	/etc/postfix/virtual \
+	/etc/sysconfig/ldap \
+	/etc/sysconfig/saslauthd
+	



From cvs at intevation.de  Wed Jan  4 23:05:04 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed,  4 Jan 2006 23:05:04 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog,1.33,1.34 
Message-ID: <20060104220504.C435C101EEA@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
add issue id

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- ChangeLog	4 Jan 2006 22:03:59 -0000	1.33
+++ ChangeLog	4 Jan 2006 22:05:02 -0000	1.34
@@ -1,4 +1,5 @@
 2006-01-04 Richard Bos <richard at radoeka.nl>
+	See issue1048
 	* configure.ac: Added AC_SUBST(WITHOPENPKG)
 	* dist_conf/common: Added CHKCONFIG, WITHOPENPKG and backupfiles
 	* dist_conf/suse: Added assignment for backupfiles



From cvs at intevation.de  Thu Jan  5 22:45:48 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu,  5 Jan 2006 22:45:48 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog,1.34,1.35 
Message-ID: <20060105214548.CD53F101EF9@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
initial checkin of kolabsrv.  This script should replace the ...openpkg script



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- ChangeLog	4 Jan 2006 22:05:02 -0000	1.34
+++ ChangeLog	5 Jan 2006 21:45:46 -0000	1.35
@@ -1,3 +1,6 @@
+2006-01-05 Richard Bos <richard at radoeka.nl>
+	* dist_conf/kolabsrv.in: added
+
 2006-01-04 Richard Bos <richard at radoeka.nl>
 	See issue1048
 	* configure.ac: Added AC_SUBST(WITHOPENPKG)



From cvs at intevation.de  Thu Jan  5 22:45:48 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu,  5 Jan 2006 22:45:48 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf kolabsrv.in,NONE,1.1 
Message-ID: <20060105214548.D0168101EFD@lists.intevation.de>

Author: richard

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

Added Files:
	kolabsrv.in 
Log Message:
initial checkin of kolabsrv.  This script should replace the ...openpkg script



--- NEW FILE: kolabsrv.in ---
#!/bin/bash

# check if everything is correct
function check() {
	if [ $SERVICE = "openldap" ]; then
		SERVICE="ldap"
	fi	

	if [ -x "$RCDIR/$SERVICE" ]; then
		case $PARAM in
			start|START)     PARAM="start" && rcrun;;
			stop|STOP)       PARAM="stop" && rcrun;;
			restart|RESTART) PARAM="restart" && rcrun;;
			reload|RELOAD)   PARAM="reload" && rcrun;;
			status|STATUS)   PARAM="status" && rcrun;;
			*) echo "ERROR: Parameter $PARAM not supported!"
		esac
	else
		echo "ERROR $RCDIR/$SERVICE NOT found - abort"
	fi	
}

# starts/stops/restarts... the service
function rcrun() {
	$RCDIR/$SERVICE $PARAM
	retc=$?
	if [ $retc -ne 0 ] && [ $retc -ne 3 ]; then
		( echo "ERROR: $RCDIR/$SERVICE $PARAM failed"
		  echo "Run: /usr/sbin/kolab rc all stop"
		  echo "to stop all services"
		) >&2
		exit 1
	fi
}	

# variables
RC=$1

case $RC in 
	rc) ;; # okay
	*) echo "ERROR: $1 not supported";;
esac

if [[ "$2" == "all" ]]; then
	SERVICES="ldap saslauthd spamd amavis apache2 clamd cyrus postfix"
	# SERVICES="$SERVICES kolab"
else
	SERVICES=$2
fi

PARAM=$3
#RCDIR=@rc_dir@
RCDIR=/etc/init.d

for SERVICE in $SERVICES; do
	check $SERVICE
done




From cvs at intevation.de  Thu Jan  5 22:58:40 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu,  5 Jan 2006 22:58:40 +0100 (CET)
Subject: richard: server/kolabd/kolabd kolab_bootstrap.in, 1.14, 1.15 ChangeLog,
	1.35, 1.36 
Message-ID: <20060105215840.E3F98101EF9@lists.intevation.de>

Author: richard

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

Modified Files:
	kolab_bootstrap.in ChangeLog 
Log Message:
unexpanded tabs, to improve readability



Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- kolab_bootstrap.in	4 Jan 2006 22:03:59 -0000	1.14
+++ kolab_bootstrap.in	5 Jan 2006 21:58:38 -0000	1.15
@@ -426,8 +426,8 @@
                $_ = <$tmpl>;
                $found_end = /^KOLAB_META_END$/;
            }
-			  $_ = <$tmpl>;
-		 }
+           $_ = <$tmpl>;
+        }
         s/\@\@\@base_dn\@\@\@/$base_dn/g;
         s/\@\@\@bind_dn\@\@\@/$bind_dn/g;
         s/\@\@\@bind_pw_hash\@\@\@/$bind_pw/g;
@@ -437,7 +437,7 @@
       undef $slpd;
       undef $tmpl;
       
-		my $tmplname = "@sysconfdir@/kolab/templates/slapd.replicas.template";
+      my $tmplname = "@sysconfdir@/kolab/templates/slapd.replicas.template";
       $confname = "@ldapserver_confdir@/slapd.replicas";
 
       $tmpl = IO::File->new($tmplname, "r") || die "could not read $tmplname";
@@ -452,13 +452,12 @@
            }
            $_ = <$tmpl>;
         }
-         print $slpd $_;
+        print $slpd $_;
       }
       undef $slpd;
-		undef $tmpl;
-		
-		$tmplname = "@sysconfdir@/kolab/templates/slapd.access.template";
+      undef $tmpl;
 		
+      $tmplname = "@sysconfdir@/kolab/templates/slapd.access.template";
       $confname = "@ldapserver_confdir@/slapd.access";
 
       $tmpl = IO::File->new($tmplname, "r") || die "could not read $tmplname";
@@ -473,10 +472,10 @@
            }
            $_ = <$tmpl>;
         }
-         print $slpd $_;
-       }
-       undef $slpd;
-       undef $tmpl;
+        print $slpd $_;
+      }
+      undef $slpd;
+      undef $tmpl;
 		
       # now we must startup slapd
       print "temporarily starting slapd\n";

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- ChangeLog	5 Jan 2006 21:45:46 -0000	1.35
+++ ChangeLog	5 Jan 2006 21:58:38 -0000	1.36
@@ -1,4 +1,5 @@
 2006-01-05 Richard Bos <richard at radoeka.nl>
+	* kolab_bootstap.in: unexpanded tabs, to improve readability
 	* dist_conf/kolabsrv.in: added
 
 2006-01-04 Richard Bos <richard at radoeka.nl>



From cvs at intevation.de  Fri Jan  6 13:24:38 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri,  6 Jan 2006 13:24:38 +0100 (CET)
Subject: richard: server/kolabd/kolabd Makefile.am, 1.14, 1.15 ChangeLog, 1.36,
	1.37 
Message-ID: <20060106122438.814871005D6@lists.intevation.de>

Author: richard

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

Modified Files:
	Makefile.am ChangeLog 
Log Message:
* Makefile.am: added support to install kolabsrv for non openpkg
  based distributions.  kolabsrv is a replacement for the openpkg script
* dist_conf/kolabsrv.in: replaced /bin/bash with @BASH@ and used
  @kolab_rcdir@ for the rc directory
* dist_conf/suse: Updated KOLABRC to use the kolabsrv script



Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile.am	3 Jan 2006 21:59:08 -0000	1.14
+++ Makefile.am	6 Jan 2006 12:24:36 -0000	1.15
@@ -133,9 +133,16 @@
 kolabdocdir = $(pkgdocdir)/@PACKAGE@
 dist_kolabdoc_DATA = $(kolabdoc_FILES)
 
+if OPENPKG
 kolabsbin_FILES = kolabd \
 	kolabconf \
 	kolabcheckperm
+else
+kolabsbin_FILES = kolabd \
+	kolabconf \
+	kolabcheckperm \
+	dist_conf/kolabsrv
+endif	
 
 kolabsbindir = $(sbindir)/
 kolabsbin_DATA = $(kolabsbin_FILES)
@@ -514,6 +521,12 @@
 CLEANFILES += rc.kolabd
 EXTRA_DIST += rc.kolabd.in
 
+dist_conf/kolabsrv:
+	@$(mkinstalldirs) .
+	$(do_subst) <$(srcdir)/dist_conf/kolabsrv.in >$@
+CLEANFILES += dist_conf/kolabsrv
+EXTRA_DIST += dist_conf/kolabsrv.in
+
 # Please update the perl-kolab, kolab-webadmin and kolab-resource-handlers
 # Makefile.ams too when the underneath EXTRA_DIST assignment is altered
 EXTRA_DIST += dist_conf/common \
@@ -538,6 +551,9 @@
 	chmod +744 $(DESTDIR)$(sbindir)/kolabconf
 	chmod +744 $(DESTDIR)$(sbindir)/kolabcheckperm
 	chmod +755 $(DESTDIR)$(bindir)/kolabpasswd
+if ! OPENPKG
+	chmod +755 $(DESTDIR)$(sbindir)/kolabsrv
+endif
 if OPENPKG
 	chmod +755 $(DESTDIR)$(kolabrcdir)/$(kolabrc_DATA)
 	chmod +744 $(DESTDIR)$(bindir)/kolab

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- ChangeLog	5 Jan 2006 21:58:38 -0000	1.36
+++ ChangeLog	6 Jan 2006 12:24:36 -0000	1.37
@@ -1,3 +1,10 @@
+2006-01-06 Richard Bos <richard at radoeka.nl>
+	* Makefile.am: added support to install kolabsrv for non openpkg
+	  based distributions.  kolabsrv is a replacement for the openpkg script
+	* dist_conf/kolabsrv.in: replaced /bin/bash with @BASH@ and used
+	  @kolab_rcdir@ for the rc directory
+	* dist_conf/suse: Updated KOLABRC to use the kolabsrv script
+
 2006-01-05 Richard Bos <richard at radoeka.nl>
 	* kolab_bootstap.in: unexpanded tabs, to improve readability
 	* dist_conf/kolabsrv.in: added



From cvs at intevation.de  Fri Jan  6 13:24:38 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri,  6 Jan 2006 13:24:38 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf suse, 1.14, 1.15 kolabsrv.in,
	1.1, 1.2 
Message-ID: <20060106122438.884331005D8@lists.intevation.de>

Author: richard

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

Modified Files:
	suse kolabsrv.in 
Log Message:
* Makefile.am: added support to install kolabsrv for non openpkg
  based distributions.  kolabsrv is a replacement for the openpkg script
* dist_conf/kolabsrv.in: replaced /bin/bash with @BASH@ and used
  @kolab_rcdir@ for the rc directory
* dist_conf/suse: Updated KOLABRC to use the kolabsrv script



Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- suse	4 Jan 2006 22:03:59 -0000	1.14
+++ suse	6 Jan 2006 12:24:36 -0000	1.15
@@ -11,7 +11,7 @@
 kolab_susr=root
 
 BASHELL=/bin/bash
-KOLABRC=${sbindir}/kolab
+KOLABRC=${sbindir}/kolabsrv
 PERL=${bindir}/perl
 PHP=${bindir}/php
 

Index: kolabsrv.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolabsrv.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolabsrv.in	5 Jan 2006 21:45:46 -0000	1.1
+++ kolabsrv.in	6 Jan 2006 12:24:36 -0000	1.2
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@BASH@
 
 # check if everything is correct
 function check() {
@@ -49,8 +49,7 @@
 fi
 
 PARAM=$3
-#RCDIR=@rc_dir@
-RCDIR=/etc/init.d
+RCDIR=@kolab_rcdir@
 
 for SERVICE in $SERVICES; do
 	check $SERVICE



From cvs at intevation.de  Fri Jan  6 15:58:38 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri,  6 Jan 2006 15:58:38 +0100 (CET)
Subject: bh: server obmtool.conf,1.174.2.22,1.174.2.23 
Message-ID: <20060106145838.E61C71005DB@lists.intevation.de>

Author: bh

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

Modified Files:
      Tag: kolab_2_0_branch
	obmtool.conf 
Log Message:
Yet another security update for apache from OpenPKG


Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.174.2.22
retrieving revision 1.174.2.23
diff -u -d -r1.174.2.22 -r1.174.2.23
--- obmtool.conf	23 Dec 2005 10:36:35 -0000	1.174.2.22
+++ obmtool.conf	6 Jan 2006 14:58:36 -0000	1.174.2.23
@@ -117,7 +117,7 @@
     @install ${loc}sed-4.1.4-2.4.0
     @install ${loc}libxml-2.6.19-2.4.0
     @install ${loc}libxslt-1.1.14-2.4.0 # WARNING: Remove libgcrypt before building!
-    @install ${altloc}apache-1.3.33-2.4.4_kolab \
+    @install ${altloc}apache-1.3.33-2.4.5_kolab \
         --with=mod_auth_ldap \
         --with=mod_dav \
         --with=mod_php \



From cvs at intevation.de  Fri Jan  6 15:58:38 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri,  6 Jan 2006 15:58:38 +0100 (CET)
Subject: bh: server/apache kolab.patch, 1.5.2.3, 1.5.2.4 Makefile, 1.16.2.3,
	1.16.2.4 
Message-ID: <20060106145838.EEE151006A8@lists.intevation.de>

Author: bh

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

Modified Files:
      Tag: kolab_2_0_branch
	kolab.patch Makefile 
Log Message:
Yet another security update for apache from OpenPKG


Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/apache/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	19 Dec 2005 13:11:16 -0000	1.5.2.3
+++ kolab.patch	6 Jan 2006 14:58:36 -0000	1.5.2.4
@@ -4,8 +4,8 @@
  Group:        Web
  License:      ASF
  Version:      %{V_apache}
--Release:      2.4.4
-+Release:      2.4.4_kolab
+-Release:      2.4.5
++Release:      2.4.5_kolab
  
  #   package options (suexec related)
  %option       with_suexec               yes

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache/Makefile,v
retrieving revision 1.16.2.3
retrieving revision 1.16.2.4
diff -u -d -r1.16.2.3 -r1.16.2.4
--- Makefile	19 Dec 2005 13:11:16 -0000	1.16.2.3
+++ Makefile	6 Jan 2006 14:58:36 -0000	1.16.2.4
@@ -10,7 +10,7 @@
 
 PACKAGE=apache
 VERSION=1.3.33
-RELEASE=2.4.4
+RELEASE=2.4.5
 
 RPM=/kolab/bin/openpkg rpm
  



From cvs at intevation.de  Fri Jan  6 16:04:10 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri,  6 Jan 2006 16:04:10 +0100 (CET)
Subject: bh: server obmtool.conf,1.174.2.23,1.174.2.24 
Message-ID: <20060106150410.AA4511005DB@lists.intevation.de>

Author: bh

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

Modified Files:
      Tag: kolab_2_0_branch
	obmtool.conf 
Log Message:
Do not force registration of the OpenPKG instance.

The openpkg-registry RPM is still installed, though, for the convenience
of users who want to register because they e.g. need additional openpkg
packages.

Also, add ${loc} so that the openpkg-registry RPM is not always
downloaded.


Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.174.2.23
retrieving revision 1.174.2.24
diff -u -d -r1.174.2.23 -r1.174.2.24
--- obmtool.conf	6 Jan 2006 14:58:36 -0000	1.174.2.23
+++ obmtool.conf	6 Jan 2006 15:04:08 -0000	1.174.2.24
@@ -21,10 +21,6 @@
 			--url) URL="$arg";;
         esac
 	done
-	if test -z "$USERNAME" ; then
-		echo "OpenPKG requires a username for registration. Please supply one with the --user=<username> option at the end of the commandline."
-		exit 1
-	fi
 %kolab
     echo "---- boot/build ${NODE} %${CMD} ----"
     kolab_version="pre-2.0.2-snapshot-20051222";
@@ -51,10 +47,7 @@
         --muid="19414" --ruid="19415" --nuid="19416" \
         --mgid="19414" --rgid="19415" --ngid="19416"
 
-    @install openpkg-registry-0.2.5-20051129
-    $PREFIX/bin/openpkg register --mode=post --user=$USERNAME
-    $PREFIX/bin/openpkg register --printstatus && echo "Please associate the instance now. Then RETURN to continue." && read DUMMY
-
+    @install ${loc}openpkg-registry-0.2.5-20051129
     @install ${loc}make-3.80-2.4.0
     @install ${loc}binutils-2.16.1-2.4.0
     @install ${loc}gcc-3.4.4-2.4.0



From cvs at intevation.de  Fri Jan  6 16:05:31 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri,  6 Jan 2006 16:05:31 +0100 (CET)
Subject: bh: server obmtool.conf,1.174.2.24,1.174.2.25 
Message-ID: <20060106150531.C67D31005DB@lists.intevation.de>

Author: bh

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

Modified Files:
      Tag: kolab_2_0_branch
	obmtool.conf 
Log Message:
Stick to openpkg 2.4 for this release.


Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.174.2.24
retrieving revision 1.174.2.25
diff -u -d -r1.174.2.24 -r1.174.2.25
--- obmtool.conf	6 Jan 2006 15:04:08 -0000	1.174.2.24
+++ obmtool.conf	6 Jan 2006 15:05:29 -0000	1.174.2.25
@@ -40,7 +40,7 @@
     fi
 
     # start from scratch or upgrade within 2.0.x
-    @install ${loc}openpkg-2.5.0-2.5.0 \
+    @install ${loc}openpkg-2.4.3-2.4.3 \
         --tag="kolab" \
         --prefix="${PREFIX}" \
         --user="${CMD}" --group="${CMD}" \



From cvs at intevation.de  Fri Jan  6 16:14:32 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri,  6 Jan 2006 16:14:32 +0100 (CET)
Subject: bh: server obmtool.conf,1.174.2.25,1.174.2.26 
Message-ID: <20060106151432.B47C81005DB@lists.intevation.de>

Author: bh

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

Modified Files:
      Tag: kolab_2_0_branch
	obmtool.conf 
Log Message:
The new release contains kolab security advisory 04 which requires some
packages to be recompiled.  If somebody really upgrades directly from
2.0.1 to 2.0.2 without having applied that advisory in between, they
need to recompile these packages as well.  Some of the packages are
recompiled automatically because they have new versions anyway, but some
use the same version/source RPM.  For those packges, force the rebuild
by using @trigger instead of at install.


Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.174.2.25
retrieving revision 1.174.2.26
diff -u -d -r1.174.2.25 -r1.174.2.26
--- obmtool.conf	6 Jan 2006 15:05:29 -0000	1.174.2.25
+++ obmtool.conf	6 Jan 2006 15:14:30 -0000	1.174.2.26
@@ -81,22 +81,22 @@
     @install ${loc}perl-xml-5.8.7-2.4.0
     @install ${loc}perl-net-5.8.7-2.4.0
     @install ${loc}perl-comp-5.8.7-2.4.0
-    @install ${loc}perl-ssl-5.8.7-2.4.0
+    @trigger ${loc}perl-ssl-5.8.7-2.4.0
     @install ${loc}perl-www-5.8.7-2.4.0
     @install ${altloc}imap-2004d-2.4.0_kolab --with=annotate
     @install ${loc}procmail-3.22-2.4.0
     @install ${loc}db-4.2.52.2-2.2.0
-    @install ${altloc}openldap-2.2.27-2.4.0_kolab
+    @trigger ${altloc}openldap-2.2.27-2.4.0_kolab
     @install ${loc}m4-1.4.3-2.4.0
     @install ${loc}bison-2.0-2.4.0
     @install ${loc}flex-2.5.31-2.4.0
     @install ${loc}groff-1.19.1-2.4.0
-    @install ${loc}sasl-2.1.21-2.4.0 --with=ldap --with=login
+    @trigger ${loc}sasl-2.1.21-2.4.0 --with=ldap --with=login
     @install ${loc}getopt-20030307-2.4.0
-    @install ${loc}proftpd-1.3.0rc1-2.4.1 --with=ldap
+    @trigger ${loc}proftpd-1.3.0rc1-2.4.1 --with=ldap
     @install ${loc}gdbm-1.8.3-2.4.0
     @install ${plusloc}dbtool-1.6-2.4.0
-    @install ${altloc}postfix-2.2.3-2.4.1_kolab --with=ldap --with=sasl --with=ssl
+    @trigger ${altloc}postfix-2.2.3-2.4.1_kolab --with=ldap --with=sasl --with=ssl
     @install ${loc}perl-ldap-5.8.7-2.4.0
     @install ${loc}perl-db-5.8.7-2.4.0
     @install ${altloc}imapd-2.2.12-2.4.0_kolab3 --with=group --with=ldap --with=annotate --with=atvdom --with=skiplist --with=goodchars --with=morelogging



From cvs at intevation.de  Fri Jan  6 16:16:51 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri,  6 Jan 2006 16:16:51 +0100 (CET)
Subject: bh: server release-notes.txt, 1.15.2.10, 1.15.2.11 obmtool.conf,
	1.174.2.26, 1.174.2.27 
Message-ID: <20060106151651.B5D9F1005DB@lists.intevation.de>

Author: bh

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

Modified Files:
      Tag: kolab_2_0_branch
	release-notes.txt obmtool.conf 
Log Message:
Prepare for the 2.0.2 release


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.15.2.10
retrieving revision 1.15.2.11
diff -u -d -r1.15.2.10 -r1.15.2.11
--- release-notes.txt	21 Dec 2005 20:10:01 -0000	1.15.2.10
+++ release-notes.txt	6 Jan 2006 15:16:49 -0000	1.15.2.11
@@ -1,5 +1,5 @@
 Release notes Kolab2 Server
-(Version , Kolab Server 2.0.2)
+(Version 20060106, Kolab Server 2.0.2)
 
 
 For upgrading and installation instructions, please refer to the
@@ -44,7 +44,7 @@
 
       * Fixing:
           Issue820 (error when re-adding distribution list)
-	  Issue942 (postfix relayhost parameter syntax changed
+	  Issue942 (postfix relayhost parameter syntax changed)
 	  Issue886 (i18n problem)
 	  Issue960 (extra newlines in vacation text)
 

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.174.2.26
retrieving revision 1.174.2.27
diff -u -d -r1.174.2.26 -r1.174.2.27
--- obmtool.conf	6 Jan 2006 15:14:30 -0000	1.174.2.26
+++ obmtool.conf	6 Jan 2006 15:16:49 -0000	1.174.2.27
@@ -23,7 +23,7 @@
 	done
 %kolab
     echo "---- boot/build ${NODE} %${CMD} ----"
-    kolab_version="pre-2.0.2-snapshot-20051222";
+    kolab_version="2.0.2";
     PREFIX=/${CMD};
     loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
     plusloc='+'



From cvs at intevation.de  Fri Jan  6 16:22:09 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri,  6 Jan 2006 16:22:09 +0100 (CET)
Subject: bh: server README.1st,1.23.2.7,1.23.2.8 
Message-ID: <20060106152209.018CB1005DB@lists.intevation.de>

Author: bh

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

Modified Files:
      Tag: kolab_2_0_branch
	README.1st 
Log Message:
More preparation for 2.0.2


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.23.2.7
retrieving revision 1.23.2.8
diff -u -d -r1.23.2.7 -r1.23.2.8
--- README.1st	27 Sep 2005 09:11:13 -0000	1.23.2.7
+++ README.1st	6 Jan 2006 15:22:06 -0000	1.23.2.8
@@ -268,5 +268,11 @@
 manually with cyradm.
 
 
+Upgrade from 2.0.1 to 2.0.2
+---------------------------
+
+There's nothing special to be done.
+
+
 
 $Id$



From cvs at intevation.de  Fri Jan  6 18:25:30 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri,  6 Jan 2006 18:25:30 +0100 (CET)
Subject: bh: server release-notes.txt,1.15.2.11,1.15.2.12 
Message-ID: <20060106172530.BA41A1005DB@lists.intevation.de>

Author: bh

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

Modified Files:
      Tag: kolab_2_0_branch
	release-notes.txt 
Log Message:
Forgot the latest kolab-resource-handlers update with the fix for Kolab
Security Advisory 07


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.15.2.11
retrieving revision 1.15.2.12
diff -u -d -r1.15.2.11 -r1.15.2.12
--- release-notes.txt	6 Jan 2006 15:16:49 -0000	1.15.2.11
+++ release-notes.txt	6 Jan 2006 17:25:28 -0000	1.15.2.12
@@ -18,6 +18,7 @@
       http://kolab.org/security/kolab-vendor-notice-04.txt
       http://kolab.org/security/kolab-vendor-notice-05.txt
       http://kolab.org/security/kolab-vendor-notice-06.txt
+      http://kolab.org/security/kolab-vendor-notice-07.txt
 
     - suport for the new registration required by OpenPKG for updates.
 
@@ -32,11 +33,12 @@
 	  Issue921 (kolabquotawarn may send warnings for users with 0% quota)
 	  Issue919 (non-escaped shell metachars in passwd)
 
-    - kolab-resource-handlers 0.3.9-20050912 -> 0.3.9-20051219
+    - kolab-resource-handlers 0.3.9-20050912 -> 0.3.9-20051222
 
       * Fixing:
           Issue952 (mailto: required in ical rewritten by kolabfilter)
 	  Issue958 (From: rewritten twice when mail is relayed between servers)
+	  Issue1042 (server modifies email attachment content)
 
     - kolab-webadmin 0.4.0-20050831 -> 0.4.0-20051219
 



From cvs at intevation.de  Fri Jan  6 21:37:45 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri,  6 Jan 2006 21:37:45 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog, 1.37, 1.38 kolab_bootstrap.in,
	1.15, 1.16 
Message-ID: <20060106203745.154C51005DE@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog kolab_bootstrap.in 
Log Message:
Generalize the the call to the openldap deamon

* kolab_bootstrap.in: replaced openldap in openpkg rc calls with @LDAPD@
* dist_conf/common: added @LDAPD@
* dist_conf/kolab, dist_conf/suse: added definition for LDAPD
* dist_conf/kolabsrv.in: use @LDAPD@ to start the ldap deamon



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- ChangeLog	6 Jan 2006 12:24:36 -0000	1.37
+++ ChangeLog	6 Jan 2006 20:37:43 -0000	1.38
@@ -1,4 +1,10 @@
 2006-01-06 Richard Bos <richard at radoeka.nl>
+	* kolab_bootstrap.in: replaced openldap in openpkg rc calls with @LDAPD@
+	* dist_conf/common: added @LDAPD@
+	* dist_conf/kolab, dist_conf/suse: added definition for LDAPD
+	* dist_conf/kolabsrv.in: use @LDAPD@ to start the ldap deamon
+
+2006-01-06 Richard Bos <richard at radoeka.nl>
 	* Makefile.am: added support to install kolabsrv for non openpkg
 	  based distributions.  kolabsrv is a replacement for the openpkg script
 	* dist_conf/kolabsrv.in: replaced /bin/bash with @BASH@ and used

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- kolab_bootstrap.in	5 Jan 2006 21:58:38 -0000	1.15
+++ kolab_bootstrap.in	6 Jan 2006 20:37:43 -0000	1.16
@@ -649,7 +649,7 @@
 
    if ($ldap_uri =~ /127\.0\.0\.1/ || $ldap_uri =~ /localhost/) {
       print "\nkill temporary slapd\n\n";
-      system("@KOLABRC@ rc openldap stop");
+      system("@KOLABRC@ rc @LDAPD@ stop");
       sleep 1; # actually race should be impossible
       system("killall -9 slapd >/dev/null 2>&1");
    }
@@ -716,7 +716,7 @@
   ##### Slave server setup
 
   print "stop running slapd (if any)\n";
-  kolab_system("@KOLABRC@ rc openldap stop");
+  kolab_system("@KOLABRC@ rc @LDAPD@ stop");
 
   # Make sure that no rogue demons are running
   tryConnect( '127.0.0.1', 389 ) && die "A process is already listening to port 389 (ldap)\n"
@@ -834,9 +834,9 @@
 is copied over to this slave. Please make sure that this slave is entered into the list 
 of kolabhosts on the master before proceeding.
 EOS
-  kolab_system("ssh -CA $master_host @KOLABRC@ rc openldap stop");
+  kolab_system("ssh -CA $master_host @KOLABRC@ rc @LDAPD@ stop");
   kolab_system("ssh -CA $master_host @libdir@/openpkg/tar -C @ldapserver_statedir@ -pcf - openldap-data | @libdir@/openpkg/tar -C @ldapserver_statedir@ -pxf -");
-  kolab_system("ssh -CA $master_host @KOLABRC@ rc openldap start");
+  kolab_system("ssh -CA $master_host @KOLABRC@ rc @LDAPD@ start");
 
   print "Updating configuration, please ignore any initial errors from kolabconf\n\n";
   my $cfg;



From cvs at intevation.de  Fri Jan  6 21:37:45 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri,  6 Jan 2006 21:37:45 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf common, 1.12, 1.13 kolab, 1.15,
	1.16 kolabsrv.in, 1.2, 1.3 suse, 1.15, 1.16 
Message-ID: <20060106203745.1F4C31006A8@lists.intevation.de>

Author: richard

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

Modified Files:
	common kolab kolabsrv.in suse 
Log Message:
Generalize the the call to the openldap deamon

* kolab_bootstrap.in: replaced openldap in openpkg rc calls with @LDAPD@
* dist_conf/common: added @LDAPD@
* dist_conf/kolab, dist_conf/suse: added definition for LDAPD
* dist_conf/kolabsrv.in: use @LDAPD@ to start the ldap deamon



Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- common	4 Jan 2006 22:03:59 -0000	1.12
+++ common	6 Jan 2006 20:37:43 -0000	1.13
@@ -13,6 +13,7 @@
 	-e 's,[@]BASH[@],$(BASHELL),g' \
 	-e 's,[@]CHKCONFIG[@],$(CHKCONFIG),g' \
 	-e 's,[@]KOLABRC[@],$(KOLABRC),g' \
+	-e 's,[@]LDAPD[@],$(LDAPD),g' \
 	-e 's,[@]PERL[@],$(PERL),g' \
 	-e 's,[@]PHP[@],$(PHP),g' \
 	-e 's,[@]VERSION[@],$(VERSION),g' \

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- kolab	1 Jan 2006 21:20:24 -0000	1.15
+++ kolab	6 Jan 2006 20:37:43 -0000	1.16
@@ -24,6 +24,9 @@
 PHP=${bindir}/php
 KOLABRC=${bindir}/openpkg
 
+# Define the deamons that are executed with openpkg rc
+LDAPD=openldap
+
 kolab_rcdir=${sysconfdir}/rc.d
 pkgdocdir=${datadir}/doc
 

Index: kolabsrv.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolabsrv.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolabsrv.in	6 Jan 2006 12:24:36 -0000	1.2
+++ kolabsrv.in	6 Jan 2006 20:37:43 -0000	1.3
@@ -2,10 +2,6 @@
 
 # check if everything is correct
 function check() {
-	if [ $SERVICE = "openldap" ]; then
-		SERVICE="ldap"
-	fi	
-
 	if [ -x "$RCDIR/$SERVICE" ]; then
 		case $PARAM in
 			start|START)     PARAM="start" && rcrun;;
@@ -16,7 +12,7 @@
 			*) echo "ERROR: Parameter $PARAM not supported!"
 		esac
 	else
-		echo "ERROR $RCDIR/$SERVICE NOT found - abort"
+		echo "ERROR $RCDIR/$SERVICE NOT found - abort" >&2
 	fi	
 }
 
@@ -42,7 +38,7 @@
 esac
 
 if [[ "$2" == "all" ]]; then
-	SERVICES="ldap saslauthd spamd amavis apache2 clamd cyrus postfix"
+	SERVICES="@LDAPD@ saslauthd spamd amavis apache2 clamd cyrus postfix"
 	# SERVICES="$SERVICES kolab"
 else
 	SERVICES=$2

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- suse	6 Jan 2006 12:24:36 -0000	1.15
+++ suse	6 Jan 2006 20:37:43 -0000	1.16
@@ -15,6 +15,9 @@
 PERL=${bindir}/perl
 PHP=${bindir}/php
 
+# Define the deamons that are launched from /etc/init.d
+LDAPD=ldap
+
 kolab_rcdir=${sysconfdir}/init.d
 pkgdocdir=${datadir}/doc/packages/kolab
 



From cvs at intevation.de  Sat Jan  7 15:46:14 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat,  7 Jan 2006 15:46:14 +0100 (CET)
Subject: richard: server/perl-kolab ChangeLog,1.8,1.9 
Message-ID: <20060107144614.2BFAC1005DB@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
Do not crash when a config file does not exists.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ChangeLog	3 Jan 2006 22:00:39 -0000	1.8
+++ ChangeLog	7 Jan 2006 14:46:11 -0000	1.9
@@ -1,3 +1,7 @@
+2006-01-08 Richard Bos <richard at radoeka.nl>
+	* Kolab-Conf/Conf.pm.in: do not crash when the file to be checked
+	  does not exists.
+
 2006-01-03 Richard Bos <richard at radoeka.nl>
 	* Makefile.am: distribute only the files to be distributed
 	  from the dist_conf directory



From cvs at intevation.de  Sat Jan  7 15:46:14 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat,  7 Jan 2006 15:46:14 +0100 (CET)
Subject: richard: server/perl-kolab/Kolab-Conf Conf.pm.in,1.1,1.2 
Message-ID: <20060107144614.2ED621006A0@lists.intevation.de>

Author: richard

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

Modified Files:
	Conf.pm.in 
Log Message:
Do not crash when a config file does not exists.



Index: Conf.pm.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Conf.pm.in	17 Dec 2005 21:45:32 -0000	1.1
+++ Conf.pm.in	7 Jan 2006 14:46:12 -0000	1.2
@@ -817,16 +817,23 @@
 
     foreach $key (keys %templates) {
       my $tpl = $templates{$key};
-      my $st = stat($tpl);
-      my $owner = getpwuid($st->uid).':'.getgrgid($st->gid);
-      if( ( ($st->mode & 07777) != $permissions{$tpl}) ||
-	  ($owner ne $ownership{$tpl}) ) {
-	  my $str = 'File '.$tpl.' has the wrong persmissions/owner. Found '
-		     .sprintf("%lo", $st->mode&07777).' '.$owner.', expected '
-		     .sprintf("%lo",$permissions{$tpl}).' '.$ownership{$tpl};
-	  print( "$str\n" );
-	  Kolab::log('T', $str, KOLAB_ERROR );
-	  $ok = 0;
+
+      if (-r $tpl) {
+        my $st = stat($tpl);
+        my $owner = getpwuid($st->uid).':'.getgrgid($st->gid);
+        if( ( ($st->mode & 07777) != $permissions{$tpl}) ||
+  	  ($owner ne $ownership{$tpl}) ) {
+  	  my $str = 'File '.$tpl.' has the wrong persmissions/owner. Found '
+  		     .sprintf("%lo", $st->mode&07777).' '.$owner.', expected '
+  		     .sprintf("%lo",$permissions{$tpl}).' '.$ownership{$tpl};
+  	  print( "$str\n" );
+  	  Kolab::log('T', $str, KOLAB_ERROR );
+  	  $ok = 0;
+        }
+      } else {
+        my $str = "File $tpl does not exist";
+        print "$str\n";
+        Kolab::log('T', "$str", KOLAB_ERROR );
       }
   }
   return $ok;



From cvs at intevation.de  Sat Jan  7 22:08:06 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat,  7 Jan 2006 22:08:06 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog,1.38,1.39 
Message-ID: <20060107210806.2296B1005DB@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
changed clamav_confdir to just ${sysconfdir}



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- ChangeLog	6 Jan 2006 20:37:43 -0000	1.38
+++ ChangeLog	7 Jan 2006 21:08:04 -0000	1.39
@@ -1,3 +1,6 @@
+2006-01-07 Richard Bos <richard at radoeka.nl>
+	* dist_conf/suse: changed clamav_confdir to just ${sysconfdir}
+
 2006-01-06 Richard Bos <richard at radoeka.nl>
 	* kolab_bootstrap.in: replaced openldap in openpkg rc calls with @LDAPD@
 	* dist_conf/common: added @LDAPD@



From cvs at intevation.de  Sat Jan  7 22:08:06 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat,  7 Jan 2006 22:08:06 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf suse,1.16,1.17 
Message-ID: <20060107210806.29DA51006A0@lists.intevation.de>

Author: richard

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

Modified Files:
	suse 
Log Message:
changed clamav_confdir to just ${sysconfdir}



Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- suse	6 Jan 2006 20:37:43 -0000	1.16
+++ suse	7 Jan 2006 21:08:04 -0000	1.17
@@ -35,7 +35,7 @@
 
 sysrundir=${localstatedir}/run
 
-clamav_confdir=${sysconfdir}/clamav
+clamav_confdir=${sysconfdir}
 clamav_socket=${localstatedir}/clamav/clamd.sock
 clamav_logfile=${localstatedir}/log/clamav
 clamav_pidfile=${sysrundir}/clamd.pid



From cvs at intevation.de  Sat Jan  7 22:10:22 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat,  7 Jan 2006 22:10:22 +0100 (CET)
Subject: richard: server/perl-kolab ChangeLog,1.9,1.10 
Message-ID: <20060107211022.E77431005DB@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
Give a hint _which_ config file can not be moved

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ChangeLog	7 Jan 2006 14:46:11 -0000	1.9
+++ ChangeLog	7 Jan 2006 21:10:20 -0000	1.10
@@ -1,6 +1,7 @@
-2006-01-08 Richard Bos <richard at radoeka.nl>
+2006-01-07 Richard Bos <richard at radoeka.nl>
 	* Kolab-Conf/Conf.pm.in: do not crash when the file to be checked
 	  does not exists.
+	  Give a hint _which_ config file can not be moved
 
 2006-01-03 Richard Bos <richard at radoeka.nl>
 	* Makefile.am: distribute only the files to be distributed



From cvs at intevation.de  Sat Jan  7 22:10:22 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat,  7 Jan 2006 22:10:22 +0100 (CET)
Subject: richard: server/perl-kolab/Kolab-Conf Conf.pm.in,1.2,1.3 
Message-ID: <20060107211022.E9D471006A0@lists.intevation.de>

Author: richard

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

Modified Files:
	Conf.pm.in 
Log Message:
Give a hint _which_ config file can not be moved

Index: Conf.pm.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Conf.pm.in	7 Jan 2006 14:46:12 -0000	1.2
+++ Conf.pm.in	7 Jan 2006 21:10:20 -0000	1.3
@@ -308,7 +308,7 @@
     $template->close;
     $config->close;
 
-    move($config->filename, $cfg) || Kolab::log('T', "Error moving configfile into place: $!", KOLAB_ERROR );
+    move($config->filename, $cfg) || Kolab::log('T', "Error moving configfile to $cfg, error: $!", KOLAB_ERROR );
     fixup( $cfg, $owner, $perm );
     #chown($Kolab::config{'kolab_uid'}, $Kolab::config{'kolab_gid'}, $cfg);
     #chmod(0600, $cfg) if ($cfg =~ /openldap/);



From cvs at intevation.de  Sun Jan  8 12:13:06 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  8 Jan 2006 12:13:06 +0100 (CET)
Subject: bernhard: doc/www/src footer.html.m4,1.34,1.35 
Message-ID: <20060108111306.396241005D5@lists.intevation.de>

Author: bernhard

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

Modified Files:
	footer.html.m4 
Log Message:
Feedback can also go to the users lists. 
This should make it easier to get people's feedback.


Index: footer.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/footer.html.m4,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- footer.html.m4	11 Aug 2005 17:49:45 -0000	1.34
+++ footer.html.m4	8 Jan 2006 11:13:04 -0000	1.35
@@ -6,7 +6,7 @@
 <div id="footer">
 Generated on: CURRENT_DATE
 &nbsp;&nbsp;&nbsp;
-Send feedback to the developers mailinglist.
+Send feedback to the users or developers mailinglist.
 <br/>
 These pages are hosted by <a href="http://intevation.net/">Intevation GmbH</a>.
 </div>



From cvs at intevation.de  Sun Jan  8 12:15:45 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  8 Jan 2006 12:15:45 +0100 (CET)
Subject: bernhard: doc/www/src about-kolab-clients.html.m4, 1.22,
	1.23 kolab2-clients.html.m4, 1.2, 1.3 
Message-ID: <20060108111545.BF0261005D5@lists.intevation.de>

Author: bernhard

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

Modified Files:
	about-kolab-clients.html.m4 kolab2-clients.html.m4 
Log Message:
Various minor cleanups in the client information.
This still needs more work of course.


Index: about-kolab-clients.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/about-kolab-clients.html.m4,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- about-kolab-clients.html.m4	6 Dec 2005 12:05:30 -0000	1.22
+++ about-kolab-clients.html.m4	8 Jan 2006 11:15:43 -0000	1.23
@@ -4,26 +4,28 @@
 
 <h1>About Kolab Clients</h1>
 
-<a href="#kolab2clients">Clients for Kolab-2</a><br>
-&nbsp;&nbsp;<a href="#kdeclient2">KDE Kontact Client for Linux/Unix</a><br>
-&nbsp;&nbsp;<a href="#toltec2">Microsoft Outlook Plugin: Toltec Connector 2 for Outlook</a><br>
-&nbsp;&nbsp;<a href="#konsec">MAPI Storage Provider for Microsoft Windows: KONSEC Konnektor for Outlook</a><br>
-&nbsp;&nbsp;<a href="#horde">Horde Webmail</a><br>
-
+Any standard client can connect to the various services
+a Kolab Server provides, e.g. Email (SMTP, POP3, IMAP), iCalendar services (Email), Addressbook/Management (LDAP) or Freebusy lists (HTTP). 
 <p>
-<a href="#otherkolabclients">Other Kolab-related Clients</a><br>
-&nbsp;&nbsp;<a href="#synckolab">Thunderbird Plugin: Sync Kolab</a><br>
-&nbsp;&nbsp;<a href="#aethera">Aethera</a><br>
-&nbsp;&nbsp;<a href="#bynari_v2">Outlook Plugin: Bynari v2</a><br>
+For an integrated groupware experience, more is needed.
+Clients must understand the Kolab2 storage format 
+and have necessary features, like setting access controls
+dealing with iCalendar emails and freebusy lists. 
+Any non-web client must also offer offline support 
+and should do electronic signatures.
+<p>
+We encourage anyone to implement Kolab features in their email, 
+addressbook or organiser applications independently from the Kolab Project.
+An entry in the following list of potential Kolab clients 
+subsequently does not necessarily mean endorsement.
+
 
 <a name="kolab2clients">
 <h2>Clients for Kolab-2</h2>
 </a>
-The following software fulfills the client criteria of Kolab-2.
-In addition people from the Kolab project are directly involved 
-or there is a close cooperation.
+
 <a name="kdeclient2">
-<h3>KDE Client for Kolab-2</h3>
+<h3>KDE Client (Kontact)</h3>
 </a>
 
 <a href="http://www.kontact.org"><img border="0" alt="Kontact"
@@ -55,7 +57,7 @@
 
 
 <a name="toltec2">
-<h3>Outlook Plugin: Toltec Connector 2</h3>
+<h3>Microsoft Outlook: Toltec Connector 2</h3>
 </a>
 
 <a href="http://www.toltec.co.za"><img border="0" alt="Toltec"
@@ -76,6 +78,10 @@
 User and groups can share folders 
 including those that contain emails, calendar items, tasks and contacts
 with the Toltec Connector.
+Toltec Connector supports Kolab 2 shared public folders
+and users report success syncing with mobile devices like Palms Pilots
+and Windows CE devices using ActiveSync.
+<!-- reference: http://kolab.org/pipermail/kolab-users/2005-November/003943.html--> 
 <p>
 The Kolab2 XML Storage Format has been designed and developed
 in cooperation with the Toltec developers.
@@ -108,7 +114,7 @@
   src="images/horde-logo.png" align="right"></a>
 
 License: Free Software (GPL)<br>
-Status: pre Beta
+Status: experimental
 
 <p>
 Currently part of <a href="http://www.horde.org">Horde</a> CVS, this is still
@@ -124,6 +130,16 @@
 <a href="webclient.html">here</a>.
 
 
+<a name="synckolab">
+<h3>Thunderbird Plugin: Sync Kolab</h3>
+</a>
+
+License: Same as Thunderbird which is Free Software<br>
+Status: experimental <br>
+Homepage: <a href="http://www.gargan.org/extensions/synckolab.html"
+>http://www.gargan.org/extensions/synckolab.html</a>
+
+
 <a name="kolab1clients">
 <h2>Clients for Kolab-1</h2>
 </a>
@@ -184,23 +200,6 @@
 Stable version available since mid October 2003.<br>
 Users reported good experiences.
 
-
-<a name="otherkolabclients">
-<h2>Other Kolab-related Clients</h2>
-</a>
-
-These are products not tested by the Kolab developers.
-
-<a name="synckolab">
-<h3>Thunderbird Plugin: Sync Kolab</h3>
-</a>
-
-License: Same as Thunderbird <br>
-Status: In Development
-Homepage: <a href="http://www.gargan.org/extensions/synckolab.html"
->http://www.gargan.org/extensions/synckolab.html</a>
-
-
 <a name="aethera">
 <h3>Aethera</h3>
 </a>
@@ -211,7 +210,6 @@
 
 <p>
 Aethera is a independent client running on Windows and GNU/Linux.
-Its homepage says it is a Kolab Client. 
-The developers are working eagerly on making aethera a Kolab 2 client.
+Its homepage says it is a Kolab 1 Client. 
 
 m4_include(footer.html.m4)

Index: kolab2-clients.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/kolab2-clients.html.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolab2-clients.html.m4	10 Mar 2005 15:46:39 -0000	1.2
+++ kolab2-clients.html.m4	8 Jan 2006 11:15:43 -0000	1.3
@@ -4,17 +4,18 @@
 
 <h2>Kolab2 Clients</h2>
 
-Clients, fully compatible with Kolab2 and its storage format 
+Clients, fully compatible with Kolab2 and its storage format.
+Also see <a href="./about-kolab-clients.html">About Kolab Clients</a>.
+
 
 <ul>
-<li> 
-	Outlook with the Toltec Connector (since version 2 betas)
 <li>
-	KDE Kolab2 Client (KDE_3_3_BRANCH + proko2 Branch)
-	(Note that the upcoming KDE 3.4 will be an almost complete 
-	Kolab2 Client except personal distribution lists.)
+	KDE Kolab2 Client 
+	(Kontact; proko2 Branch can be build for KDE 3.2., 3.3 and 3.4)
+<li> 
+	Outlook with the Toltec Connector (since version 2)
 <li>
-	Kolab2 Web Client based on Horde (in development)
+	Outlook with Konsec
 
 </ul>
 



From cvs at intevation.de  Sun Jan  8 12:21:06 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  8 Jan 2006 12:21:06 +0100 (CET)
Subject: bernhard: doc/www/src index.html.m4,1.70,1.71 
Message-ID: <20060108112106.0EA3B1006B8@lists.intevation.de>

Author: bernhard

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

Modified Files:
	index.html.m4 
Log Message:
Reworked the introduction.
	* Added a section about winning the Linux New Media Award 2005.
	* Moved Free Software attribute to the second paragraph, because
	  this is not the first thing customers will want to know
	  and some often used parts of a solution like the proprietary
	  Outlook connectors are non-free. Being more specific is better
	  in the second part.
	* First point now describes the solution better and mentions
	  Emails, Appointments and Contacts which are the most prominent
	  areas Kolab works in. Removed "web" reference, because a real web
	  client is not here at time of writing.
	* Removed MAPI/TNEF reference. This is too technical and the
	  proprietary connectors do not completely avoid this currently.


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- index.html.m4	22 Dec 2005 19:32:59 -0000	1.70
+++ index.html.m4	8 Jan 2006 11:21:04 -0000	1.71
@@ -3,18 +3,27 @@
 <div id="date">This page was updated on:<br />$Date$</div>
 
 <p id="intro">
-Kolab is a Free Software Groupware Solution. From version 2.0
-on it allows full seamless support of mixed clients environments
-(Outlook/KDE/Web). This is because the Kolab-XML storage format
-is fully open and avoids MAPI/TNEF.
+<strong>
+Kolab is a Groupware Solution for Emails, Appointments, Contacts and more.
+</strong>
+It supports mixed clients environments (Outlook/KDE) because of an
+open storage format called Kolab-XML. 
 </p>
 
 <p id="intro">
-The Kolab Groupware Project is about the <strong>Kolab Concept</strong>
-and various software products implementing it. These are especially
-the <a href="about-kolab-server.html">Kolab Server</a> and
-several <a href="about-kolab-clients.html">Kolab Clients</a>,
-e.g. Kontact, the KDE Kolab Client.
+The Kolab Project is about the <em>Kolab Concept</em>
+and implementions.
+Especially the 
+<em><a href="about-kolab-server.html">Kolab Server</a></em> and
+the 
+<em><a href="about-kolab-clients.html">Kolab Clients</a></em>,
+e.g. KDE Kontact. Server and KDE client are Free Software.
+</p>
+
+<p id="intro">
+Kolab has won the <strong>Linux New Media Award 2005</strong>
+in the category 'Best Groupware Server' 
+[<a href="./news/pr-20051115.html">press release</a>].
 </p>
 
 



From cvs at intevation.de  Sun Jan  8 13:04:46 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  8 Jan 2006 13:04:46 +0100 (CET)
Subject: bernhard: doc/www/src index.html.m4, 1.71, 1.72 newsarchive.html.m4,
	1.10, 1.11 
Message-ID: <20060108120446.D432B1006B9@lists.intevation.de>

Author: bernhard

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

Modified Files:
	index.html.m4 newsarchive.html.m4 
Log Message:
Improved News section:
	* Added news about Server 2.0.2 release
	* Moved one june 17th 2005 news to archive.
	* Reactivated div class=news which got disabled accidentally.


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- index.html.m4	8 Jan 2006 11:21:04 -0000	1.71
+++ index.html.m4	8 Jan 2006 12:04:44 -0000	1.72
@@ -32,7 +32,7 @@
 
 <!-- news item template
 <table>
-<tr><td class="newsd">, 2005</td>
+<tr><td class="newsd">, 2006</td>
 <td class="newsh">&raquo;
 	
 </td></tr>
@@ -46,7 +46,27 @@
 <!-- BEGIN LATEST BLOCK --> <div class="latestnews">
 
 <table>
-<tr><td class="newsd">Dezember 22nd, 2005</td>
+<tr><td class="newsd">January 6th, 2006</td>
+<td class="newsh">&raquo;
+	Stable server 2.0.2 maintenance release.
+</td></tr>
+</table>
+<div class="newsb">
+	Accumulating the recent security fixes and a couple of minor
+	bugfixes done over the last months, Kolab Server edition 2.0.2
+	is now available from your favourite mirror.
+</div>
+<p>
+
+
+</div> <!-- END LATEST BLOCK -->
+
+
+<!-- BEGIN NEWS BLOCK --> <div class="news">
+
+
+<table>
+<tr><td class="newsd">December 22nd, 2005</td>
 <td class="newsh">&raquo;
 	Security Advisory 07 for Kolab Server
 </td></tr>
@@ -80,8 +100,6 @@
 </div>
 <p>
 
-</div> <!-- END LATEST BLOCK -->
-
 <table>
 <tr><td class="newsd">November 4th, 2005</td>
 <td class="newsh">&raquo;
@@ -194,28 +212,7 @@
 <p>
 
 
-<table>
-<tr><td class="newsd">June 17th, 2005</td>
-<td class="newsh">&raquo;
-	Kolab Server 2.0 RC 4 published; security and bug fixes
-</td></tr>
-</table>
-<div class="newsb">
-The latest and probably last release candidate for the Kolab Server 2
-comes with two important bugfixes
-and draws a few security updates from OpenPKG. After a brief testing 
-period it will become the stable release.
-</div>
-<p>
-
-
-<!-- BEGIN NEWS BLOCK --> <!-- <div class="news">
-
-
-
-
-
-</div> --> <!-- END NEWS BLOCK -->
+</div> <!-- END NEWS BLOCK -->
 
 <a href="./newsarchive.html">Archived news</a>
 

Index: newsarchive.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/newsarchive.html.m4,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- newsarchive.html.m4	16 Nov 2005 22:34:37 -0000	1.10
+++ newsarchive.html.m4	8 Jan 2006 12:04:44 -0000	1.11
@@ -11,6 +11,22 @@
 
 <div class="news">
 
+
+<table>
+<tr><td class="newsd">June 17th, 2005</td>
+<td class="newsh">&raquo;
+	Kolab Server 2.0 RC 4 published; security and bug fixes
+</td></tr>
+</table>
+<div class="newsb">
+The latest and probably last release candidate for the Kolab Server 2
+comes with two important bugfixes
+and draws a few security updates from OpenPKG. After a brief testing 
+period it will become the stable release.
+</div>
+<p>
+
+
 <table>
 <tr><td class="newsd">June 15th, 2005</td>
 <td class="newsh">&raquo;



From cvs at intevation.de  Sun Jan  8 13:19:12 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  8 Jan 2006 13:19:12 +0100 (CET)
Subject: bernhard: doc/www/src mirrors.html.m4,1.11,1.12 
Message-ID: <20060108121912.5C749101EEF@lists.intevation.de>

Author: bernhard

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

Modified Files:
	mirrors.html.m4 
Log Message:
Adding note: linjection might lack stable server releases.


Index: mirrors.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/mirrors.html.m4,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- mirrors.html.m4	3 Jan 2006 16:12:31 -0000	1.11
+++ mirrors.html.m4	8 Jan 2006 12:19:10 -0000	1.12
@@ -13,7 +13,7 @@
   via <a href="http://ftp.belnet.be/packages/kolab/">http</a> |
   <a href="ftp://ftp.belnet.be/packages/kolab/">ftp</a>
 <li>
-  <b>Linjection</b><br>
+  <b>Linjection</b> (might lack stable server releases) <br> 
   via
   <a href="http://kolab.linjection.org/">http</a>
 </ul>



From cvs at intevation.de  Sun Jan  8 13:21:24 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  8 Jan 2006 13:21:24 +0100 (CET)
Subject: bernhard: server release-notes.txt,1.15.2.12,1.15.2.13 
Message-ID: <20060108122124.20BEF101EE7@lists.intevation.de>

Author: bernhard

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

Modified Files:
      Tag: kolab_2_0_branch
	release-notes.txt 
Log Message:
Typo.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.15.2.12
retrieving revision 1.15.2.13
diff -u -d -r1.15.2.12 -r1.15.2.13
--- release-notes.txt	6 Jan 2006 17:25:28 -0000	1.15.2.12
+++ release-notes.txt	8 Jan 2006 12:21:22 -0000	1.15.2.13
@@ -20,7 +20,7 @@
       http://kolab.org/security/kolab-vendor-notice-06.txt
       http://kolab.org/security/kolab-vendor-notice-07.txt
 
-    - suport for the new registration required by OpenPKG for updates.
+    - support for the new registration required by OpenPKG for updates.
 
     - kolabd 1.9.4-20050913 -> 1.9.4-20051219
 



From cvs at intevation.de  Mon Jan  9 22:44:33 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon,  9 Jan 2006 22:44:33 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog,1.39,1.40 
Message-ID: <20060109214433.A1D96100161@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
dist_conf/suse: changed owners and groups according the owners
and groups as defined by suse.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- ChangeLog	7 Jan 2006 21:08:04 -0000	1.39
+++ ChangeLog	9 Jan 2006 21:44:31 -0000	1.40
@@ -1,3 +1,7 @@
+2006-01-09 Richard Bos <richard at radoeka.nl>
+	* dist_conf/suse: changed owners and groups according the owners
+	  and groups as defined by suse.
+
 2006-01-07 Richard Bos <richard at radoeka.nl>
 	* dist_conf/suse: changed clamav_confdir to just ${sysconfdir}
 



From cvs at intevation.de  Mon Jan  9 22:44:33 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon,  9 Jan 2006 22:44:33 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf suse,1.17,1.18 
Message-ID: <20060109214433.A78FC1005A0@lists.intevation.de>

Author: richard

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

Modified Files:
	suse 
Log Message:
dist_conf/suse: changed owners and groups according the owners
and groups as defined by suse.



Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- suse	7 Jan 2006 21:08:04 -0000	1.17
+++ suse	9 Jan 2006 21:44:31 -0000	1.18
@@ -4,10 +4,8 @@
 kolab_mgrp=root
 kolab_uid=1002
 kolab_gid=1002
-restricted_kolab_usr=root
-restricted_kolab_grp=root
-kolab_rusr=${restricted_kolab_usr}
-kolab_rgrp=${restricted_kolab_grp}
+kolab_rusr=root
+kolab_rgrp=root
 kolab_susr=root
 
 BASHELL=/bin/bash
@@ -27,9 +25,9 @@
 amavisd_confdir=${sysconfdir}/kolab/amavisd
 amavisd_logfile=${localstatedir}/log/amavisd
 amavisd_home=${localstatedir}/amavisd
-amavisd_rusr=kolab-r
-amavisd_usr=kolab
-amavisd_grp=kolab-r
+amavisd_rusr=vscan
+amavisd_usr=root
+amavisd_grp=root
 
 fsl_logfile=${localstatedir}/log/fsl
 
@@ -42,23 +40,23 @@
 clamav_datadir=${datadir}/clamav
 freshclam_logfile=${localstatedir}/log/freshclam.log
 freshclam_pidfile=${sysrundir}/freshclam.pid
-clamav_rusr=${restricted_kolab_usr}
-clamav_usr=kolab
-clamav_grp=${restricted_kolab_usr}
+clamav_rusr=vscan
+clamav_usr=root
+clamav_grp=vscan
 
 
-emailscan_usr=${restricted_kolab_usr}
-emailscan_grp=${restricted_kolab_grp}
+emailscan_usr=root
+emailscan_grp=root
 
 emailserver_confdir=${sysconfdir}/postfix
 emailserver_socket=${libdir}/postfix/lmtp
 emailserver_localstatedir=${localstatedir}/spool/postfix
 emailserver_logfile=${localstatedir}/log/postfix.log
 emailserver_sasl_conffile=${libdir}/sasl2/smtpd.conf
-emailserver_usr=${kolab_usr}
-emailserver_musr=kolab
-emailserver_grp=${restricted_kolab_grp}
-emailserver_mail_usr=kolab
+emailserver_usr=postfix
+emailserver_musr=maildrop
+emailserver_grp=root
+emailserver_mail_usr=maildrop
 
 ftpserver_scoreboardfile=${localstatedir}/proftpd/score
 ftpserver_logfile=${localstatedir}/log/proftpd.log
@@ -114,7 +112,7 @@
 webserver_sslscache=${webserver_logdir}/ssl_scache
 webserver_sslmutex=${webserver_logdir}/ssl_mutex
 webserver_web_prefix=/kolab
-webserver_musr=kolab
+webserver_musr=wwwrun
 webserver_usr=wwwrun
 webserver_grp=www
 
@@ -128,8 +126,8 @@
 resmgr_logfile=${localstatedir}/log/resmgr.log
 resmgr_confdir=${sysconfdir}/resmgr
 resmgr_filterdir=${localstatedir}/resmgr/filter
-resmgr_usr=kolab
-resmgr_grp=kolab-n
+resmgr_usr=root
+resmgr_grp=root
 
 fbview_logfile=${localstatedir}/resmgr/fbview.log
 freebusy_logfile=${localstatedir}/resmgr/freebusy.log



From cvs at intevation.de  Mon Jan  9 23:09:10 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon,  9 Jan 2006 23:09:10 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog, 1.40, 1.41 Makefile.am, 1.15,
	1.16 
Message-ID: <20060109220910.D1AE5100161@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Makefile.am: install templates/rc.conf.template only on openpkg installations



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- ChangeLog	9 Jan 2006 21:44:31 -0000	1.40
+++ ChangeLog	9 Jan 2006 22:09:08 -0000	1.41
@@ -1,4 +1,6 @@
 2006-01-09 Richard Bos <richard at radoeka.nl>
+	* Makefile.am: install templates/rc.conf.template only on openpkg
+	  installations.
 	* dist_conf/suse: changed owners and groups according the owners
 	  and groups as defined by suse.
 

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile.am	6 Jan 2006 12:24:36 -0000	1.15
+++ Makefile.am	9 Jan 2006 22:09:08 -0000	1.16
@@ -59,7 +59,6 @@
 	templates/kolab_smtpdpolicy.conf.template \
 	templates/php.ini.template \
 	templates/proftpd.conf.template \
-	templates/rc.conf.template \
 	templates/resmgr.conf.template \
 	templates/saslauthd.conf.template \
 	templates/session_vars.php.template \
@@ -71,7 +70,12 @@
 	templates/virtual.template
 
 kolabtemplatedir = $(kolabconfdir)/templates
+if OPENPKG
+kolabtemplate_DATA = $(kolabtemplate_FILES) \
+	templates/rc.conf.template
+else
 kolabtemplate_DATA = $(kolabtemplate_FILES)
+endif
 
 
 kolabnamespace_FILES = namespace/libexec/newconfig \



From cvs at intevation.de  Tue Jan 10 16:19:50 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 10 Jan 2006 16:19:50 +0100 (CET)
Subject: bh: server obmtool.conf,1.174.2.27,1.174.2.28 
Message-ID: <20060110151950.10FE91005DD@lists.intevation.de>

Author: bh

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

Modified Files:
      Tag: kolab_2_0_branch
	obmtool.conf 
Log Message:
@trigger installs won't be needed for the next upgrade.


Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.174.2.27
retrieving revision 1.174.2.28
diff -u -d -r1.174.2.27 -r1.174.2.28
--- obmtool.conf	6 Jan 2006 15:16:49 -0000	1.174.2.27
+++ obmtool.conf	10 Jan 2006 15:19:47 -0000	1.174.2.28
@@ -81,22 +81,22 @@
     @install ${loc}perl-xml-5.8.7-2.4.0
     @install ${loc}perl-net-5.8.7-2.4.0
     @install ${loc}perl-comp-5.8.7-2.4.0
-    @trigger ${loc}perl-ssl-5.8.7-2.4.0
+    @install ${loc}perl-ssl-5.8.7-2.4.0
     @install ${loc}perl-www-5.8.7-2.4.0
     @install ${altloc}imap-2004d-2.4.0_kolab --with=annotate
     @install ${loc}procmail-3.22-2.4.0
     @install ${loc}db-4.2.52.2-2.2.0
-    @trigger ${altloc}openldap-2.2.27-2.4.0_kolab
+    @install ${altloc}openldap-2.2.27-2.4.0_kolab
     @install ${loc}m4-1.4.3-2.4.0
     @install ${loc}bison-2.0-2.4.0
     @install ${loc}flex-2.5.31-2.4.0
     @install ${loc}groff-1.19.1-2.4.0
-    @trigger ${loc}sasl-2.1.21-2.4.0 --with=ldap --with=login
+    @install ${loc}sasl-2.1.21-2.4.0 --with=ldap --with=login
     @install ${loc}getopt-20030307-2.4.0
-    @trigger ${loc}proftpd-1.3.0rc1-2.4.1 --with=ldap
+    @install ${loc}proftpd-1.3.0rc1-2.4.1 --with=ldap
     @install ${loc}gdbm-1.8.3-2.4.0
     @install ${plusloc}dbtool-1.6-2.4.0
-    @trigger ${altloc}postfix-2.2.3-2.4.1_kolab --with=ldap --with=sasl --with=ssl
+    @install ${altloc}postfix-2.2.3-2.4.1_kolab --with=ldap --with=sasl --with=ssl
     @install ${loc}perl-ldap-5.8.7-2.4.0
     @install ${loc}perl-db-5.8.7-2.4.0
     @install ${altloc}imapd-2.2.12-2.4.0_kolab3 --with=group --with=ldap --with=annotate --with=atvdom --with=skiplist --with=goodchars --with=morelogging



From cvs at intevation.de  Tue Jan 10 16:23:07 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 10 Jan 2006 16:23:07 +0100 (CET)
Subject: bh: server obmtool.conf,1.174.2.28,1.174.2.29 
Message-ID: <20060110152307.4E0561005DD@lists.intevation.de>

Author: bh

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

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


Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.174.2.28
retrieving revision 1.174.2.29
diff -u -d -r1.174.2.28 -r1.174.2.29
--- obmtool.conf	10 Jan 2006 15:19:47 -0000	1.174.2.28
+++ obmtool.conf	10 Jan 2006 15:23:05 -0000	1.174.2.29
@@ -139,7 +139,7 @@
     @install ${loc}spamassassin-3.0.3-2.4.1
     @install ${plusloc}amavisd-2.3.1-2.4.0
     @install ${loc}curl-7.14.0-2.4.0
-    @install ${altloc}clamav-0.87.1-20051123
+    @install ${altloc}clamav-0.88-20060110
     @install ${loc}vim-6.3.78-2.4.0
     @install ${plusloc}dcron-2.9-2.4.0
     @install ${altloc}perl-kolab-5.8.7-2.0_20051219



From cvs at intevation.de  Tue Jan 10 17:30:39 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 10 Jan 2006 17:30:39 +0100 (CET)
Subject: thomas: server obmtool.conf,1.174.2.29,1.174.2.30 
Message-ID: <20060110163039.EE35F1005DE@lists.intevation.de>

Author: thomas

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

Modified Files:
      Tag: kolab_2_0_branch
	obmtool.conf 
Log Message:
Added again all @trigger where we have no new packages
to assist upgrades from installations prior to 2.0.2


Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.174.2.29
retrieving revision 1.174.2.30
diff -u -d -r1.174.2.29 -r1.174.2.30
--- obmtool.conf	10 Jan 2006 15:23:05 -0000	1.174.2.29
+++ obmtool.conf	10 Jan 2006 16:30:37 -0000	1.174.2.30
@@ -62,7 +62,7 @@
     @install ${loc}ncurses-5.4.20050611-2.4.0
     @install ${loc}bzip2-1.0.3-2.4.0
     @install ${loc}pcre-6.0-2.4.1
-    @install ${loc}grep-2.5.1a-2.4.0
+    @trigger ${loc}grep-2.5.1a-2.4.0
     @install ${loc}texinfo-4.8-2.4.0
     @install ${loc}diffutils-2.8.7-2.4.0
     @install ${loc}gzip-1.3.5-2.4.1
@@ -81,22 +81,22 @@
     @install ${loc}perl-xml-5.8.7-2.4.0
     @install ${loc}perl-net-5.8.7-2.4.0
     @install ${loc}perl-comp-5.8.7-2.4.0
-    @install ${loc}perl-ssl-5.8.7-2.4.0
+    @trigger ${loc}perl-ssl-5.8.7-2.4.0
     @install ${loc}perl-www-5.8.7-2.4.0
     @install ${altloc}imap-2004d-2.4.0_kolab --with=annotate
-    @install ${loc}procmail-3.22-2.4.0
+    @trigger ${loc}procmail-3.22-2.4.0
     @install ${loc}db-4.2.52.2-2.2.0
-    @install ${altloc}openldap-2.2.27-2.4.0_kolab
+    @trigger ${altloc}openldap-2.2.27-2.4.0_kolab
     @install ${loc}m4-1.4.3-2.4.0
     @install ${loc}bison-2.0-2.4.0
     @install ${loc}flex-2.5.31-2.4.0
     @install ${loc}groff-1.19.1-2.4.0
-    @install ${loc}sasl-2.1.21-2.4.0 --with=ldap --with=login
+    @trigger ${loc}sasl-2.1.21-2.4.0 --with=ldap --with=login
     @install ${loc}getopt-20030307-2.4.0
-    @install ${loc}proftpd-1.3.0rc1-2.4.1 --with=ldap
+    @trigger ${loc}proftpd-1.3.0rc1-2.4.1 --with=ldap
     @install ${loc}gdbm-1.8.3-2.4.0
-    @install ${plusloc}dbtool-1.6-2.4.0
-    @install ${altloc}postfix-2.2.3-2.4.1_kolab --with=ldap --with=sasl --with=ssl
+    @trigger ${plusloc}dbtool-1.6-2.4.0
+    @trigger ${altloc}postfix-2.2.3-2.4.1_kolab --with=ldap --with=sasl --with=ssl
     @install ${loc}perl-ldap-5.8.7-2.4.0
     @install ${loc}perl-db-5.8.7-2.4.0
     @install ${altloc}imapd-2.2.12-2.4.0_kolab3 --with=group --with=ldap --with=annotate --with=atvdom --with=skiplist --with=goodchars --with=morelogging
@@ -136,7 +136,7 @@
 	--with=mbstring
     @install ${altloc}php-smarty-2.6.3-20040702
     @install ${plusloc}gmp-4.1.4-2.4.0
-    @install ${loc}spamassassin-3.0.3-2.4.1
+    @trigger ${loc}spamassassin-3.0.3-2.4.1
     @install ${plusloc}amavisd-2.3.1-2.4.0
     @install ${loc}curl-7.14.0-2.4.0
     @install ${altloc}clamav-0.88-20060110



From cvs at intevation.de  Wed Jan 11 04:46:24 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 11 Jan 2006 04:46:24 +0100 (CET)
Subject: steffen: server/kolab-webadmin Makefile,1.7,1.7.2.1 
Message-ID: <20060111034624.DFAC81005DC@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	Makefile 
Log Message:
Fix for issue848 (deleting users problem with distlists)

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/Makefile,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- Makefile	28 Apr 2005 00:16:59 -0000	1.7
+++ Makefile	11 Jan 2006 03:46:22 -0000	1.7.2.1
@@ -1,21 +1,25 @@
-RPM = /kolab/bin/openpkg rpm
-RPMNAME=kolab-webadmin
-
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
 endif
 
-VERSION:=`grep 'm4_define(_VERSION' $(PWD)/$(RPMNAME)/configure.ac|sed 's/m4_define(_VERSION,\(.*\))/\1/'`
+PACKAGE=kolab-webadmin
+VERSION:=`grep 'm4_define(_VERSION' $(PWD)/$(PACKAGE)/configure.ac|sed 's/m4_define(_VERSION,\(.*\))/\1/'`
+RELEASE:=`date '+%Y%m%d'`
+
+RPM = /kolab/bin/openpkg rpm
 
 all:
-	test -d $(KOLABRPMSRC)/$(RPMNAME) || mkdir $(KOLABRPMSRC)/$(RPMNAME)
-	cd $(RPMNAME) && ./bootstrap && ./configure --prefix=/kolab \
-	&& make dist && mv $(RPMNAME)-$(VERSION).tar.gz $(KOLABRPMSRC)/$(RPMNAME) 
-	cp $(RPMNAME)/$(RPMNAME).spec $(KOLABRPMSRC)/$(RPMNAME)/
-	cd $(KOLABRPMSRC)/$(RPMNAME) && $(RPM) -ba $(RPMNAME).spec --define 'kolab_version CVS'
+	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
+	cd $(PACKAGE) && ./bootstrap && ./configure --prefix=/kolab \
+	&& make dist && mv $(PACKAGE)-$(VERSION).tar.gz $(KOLABRPMSRC)/$(PACKAGE) 
+	cp $(PACKAGE)/$(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)/
+	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec --define 'kolab_version CVS'
 binary:
-	$(RPM) -bB $(RPMNAME).spec
+	$(RPM) -bB $(PACKAGE).spec
 
 release:
-	tar cvzf $(RPMNAME)-$(VERSION).tar.gz $(RPMNAME)
-	$(RPM) -ba $(RPMNAME).spec
+	tar cvzf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)
+	$(RPM) -ba $(PACKAGE).spec
+
+dist: all
+	cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/



From cvs at intevation.de  Wed Jan 11 04:46:24 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 11 Jan 2006 04:46:24 +0100 (CET)
Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php,
	1.62.2.3, 1.62.2.4 
Message-ID: <20060111034624.E234E1005DD@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	user.php 
Log Message:
Fix for issue848 (deleting users problem with distlists)

Index: user.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/Attic/user.php,v
retrieving revision 1.62.2.3
retrieving revision 1.62.2.4
diff -u -d -r1.62.2.3 -r1.62.2.4
--- user.php	13 Oct 2005 01:50:25 -0000	1.62.2.3
+++ user.php	11 Jan 2006 03:46:22 -0000	1.62.2.4
@@ -746,18 +746,22 @@
 				  '(&(objectClass=kolabGroupOfNames)(member='.$ldap->escape($dn).'))',
 				  array( 'dn', 'cn', 'mail', 'member' ) );
    $distlists = $ldap->getEntries();
+   unset( $distlists['count'] );
    foreach( $distlists as $distlist ) {
 	 $dlmail = $distlist['mail'][0];
 	 if( !$dlmail ) $dlmail = $distlist['cn'][0]; # Compatibility with old stuff
 	 if( $distlist['member']['count'] == 1 ) {
 	   $errors[] = sprintf( _("Account could not be deleted, distribution list '%s' depends on it."), $dlmail );
-	 } else {
-	   if( ldap_mod_del( $ldap->connection, $distlist['dn'], array('member' => $dn ) ) ) {
+	 }
+   }
+   if( !$errors ) foreach( $distlists as $distlist ) {
+	 $dlmail = $distlist['mail'][0];
+	 if( !$dlmail ) $dlmail = $distlist['cn'][0]; # Compatibility with old stuff
+	 if( ldap_mod_del( $ldap->connection, $distlist['dn'], array('member' => $dn ) ) ) {
 		 $messages[] = sprintf( _("Account removed from distribution list '%s'."), $dlmail );
-	   } else {
-		 $errors[] = sprintf( _("Failure to remove account from distribution list '%s', account will not be deleted."), $dlmail);
-		 break;
-	   }
+	 } else {
+	   $errors[] = sprintf( _("Failure to remove account from distribution list '%s', account will not be deleted."), $dlmail);
+	   break;
 	 }
    }
 



From cvs at intevation.de  Wed Jan 11 05:38:03 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 11 Jan 2006 05:38:03 +0100 (CET)
Subject: steffen: server/kolab-resource-handlers Makefile, 1.9,
	1.9.2.1 kolab-resource-handlers.spec, 1.126.2.11, 1.126.2.12 
Message-ID: <20060111043803.E718D1005DC@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	Makefile kolab-resource-handlers.spec 
Log Message:
Fix for issue973 (rewritten From header)

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/Makefile,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -d -r1.9 -r1.9.2.1
--- Makefile	4 Nov 2004 12:31:07 -0000	1.9
+++ Makefile	11 Jan 2006 04:38:01 -0000	1.9.2.1
@@ -1,13 +1,20 @@
-RPM = /kolab/bin/openpkg rpm
-VERSION = 0.3.9
-PEARVERSION = 1.3
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
 endif
 
+PACKAGE=kolab-resource-handlers
+VERSION = 0.3.9
+RELEASE=20060111
+PEARVERSION = 1.3
+
+RPM = /kolab/bin/openpkg rpm
+
 all:
-	test -d $(KOLABRPMSRC)/kolab-resource-handlers || mkdir $(KOLABRPMSRC)/kolab-resource-handlers
-	tar -cvj --exclude=CVS --exclude=\*~ -f $(KOLABRPMSRC)/kolab-resource-handlers/kolab-resource-handlers-$(VERSION).tar.bz2 *
-	cp kolab-resource-handlers.spec $(KOLABRPMSRC)/kolab-resource-handlers/
-	cd $(KOLABRPMSRC)/kolab-resource-handlers && wget -c "ftp://ftp.horde.org/pub/pear/pear-$(PEARVERSION).tar.bz2"
-	cd $(KOLABRPMSRC)/kolab-resource-handlers && $(RPM) -ba kolab-resource-handlers.spec
+	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
+	tar -cvj --exclude=CVS --exclude=\*~ -f $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE)-$(VERSION).tar.bz2 *
+	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)/
+	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "ftp://ftp.horde.org/pub/pear/pear-$(PEARVERSION).tar.bz2"
+	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
+
+dist: all
+	cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/

Index: kolab-resource-handlers.spec
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v
retrieving revision 1.126.2.11
retrieving revision 1.126.2.12
diff -u -d -r1.126.2.11 -r1.126.2.12
--- kolab-resource-handlers.spec	22 Dec 2005 17:48:19 -0000	1.126.2.11
+++ kolab-resource-handlers.spec	11 Jan 2006 04:38:01 -0000	1.126.2.12
@@ -8,7 +8,7 @@
 URL:		http://www.kolab.org/
 Packager:	Steffen Hansen <steffen at klaralvdalens-datakonsult.se> (Klaraelvdalens Datakonsult AB)
 Version:	%{V_kolab_reshndl}
-Release:	20051222
+Release:	20060111
 Class:		JUNK
 License:	GPL
 Group:		MAIL



From cvs at intevation.de  Wed Jan 11 05:38:03 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 11 Jan 2006 05:38:03 +0100 (CET)
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr
	kolabfilter.php, 1.26.2.1, 1.26.2.2 
Message-ID: <20060111043803.ED7871005DD@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	kolabfilter.php 
Log Message:
Fix for issue973 (rewritten From header)

Index: kolabfilter.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/Attic/kolabfilter.php,v
retrieving revision 1.26.2.1
retrieving revision 1.26.2.2
diff -u -d -r1.26.2.1 -r1.26.2.2
--- kolabfilter.php	12 Oct 2005 03:24:23 -0000	1.26.2.1
+++ kolabfilter.php	11 Jan 2006 04:38:01 -0000	1.26.2.2
@@ -98,6 +98,19 @@
   return false;
 }
 
+function rewrite_from($sender,$from) {
+  global $params;
+  $adrs = imap_rfc822_parse_adrlist($from, $params['email_domain'][0]);
+  foreach ($adrs as $adr) {
+    $fromadr = $adr->mailbox.'@'.$adr->host;
+    if( !ereg( "\(UNTRUSTED, sender is <$sender>\)", $from ) ) {
+      myLog("$from is not an allowed From address for unauthenticated users, rewriting", RM_LOG_DEBUG);
+      return '"'.$adr->personal.'(UNTRUSTED, sender is <'.$sender.'>)" '.'<'.$fromadr.'>';
+    } /* else already rewritten */
+  }
+  return $from;
+}
+
 // Check that mail from our domains have trustable
 // From: header and that mail from the outside
 // does not impersonate any user from our domain
@@ -186,13 +199,10 @@
 		} else {
 		  // Only rewrite if from is ours and envelope not
 		  if( is_my_domain( $from ) && !is_my_domain( $sender )) {
-		    if( !ereg( "\(UNTRUSTED, sender is $sender\)", $from ) ) {
-		      myLog("Rewriting From header", RM_LOG_DEBUG);
-		      $rewrittenfrom = "From: $from (UNTRUSTED, sender is $sender)\r\n";
-		    } /* else already rewritten */
+		    $rewrittenfrom = "From: ".rewrite_from( $sender, $from )."\r\n";
 		  } else {
-			// Not our domain in From, reject
-			$senderok = false;			
+		    // Not our domain in From, reject
+		    $senderok = false;			
 		  }
 		}
       }



From cvs at intevation.de  Wed Jan 11 05:42:42 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 11 Jan 2006 05:42:42 +0100 (CET)
Subject: steffen: server Makefile, 1.4, 1.4.2.1 obmtool.conf, 1.174.2.30,
	1.174.2.31 
Message-ID: <20060111044242.572331005DC@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	Makefile obmtool.conf 
Log Message:
version + updates Makefiles to build everything from the toplevel

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- Makefile	6 Aug 2004 12:27:22 -0000	1.4
+++ Makefile	11 Jan 2006 04:42:40 -0000	1.4.2.1
@@ -1,48 +1,15 @@
-checkout:
-	cvs co -d imapd server/imapd
-	cvs co -d kolab server/kolab
-	cvs co -d openldap server/openldap
-	cvs co -d perl-ldap server/perl-ldap
-	cvs co -d postfix server/postfix
-	cvs co -d proftpd server/proftpd
-	cvs co -d sasl server/sasl
-	cvs co -d doc server/doc
-
 dist:
-	cd openldap && make
-	cd sasl && make
-	cd imapd && make
-	cd postfix && make
-	cd perl-ldap && make
-	cd proftpd && make
-	cd kolab && make
-
-status: 
-	cvs status imapd
-	cvs status kolab
-	cvs status openldap
-	cvs status perl-ldap
-	cvs status postfix
-	cvs status proftpd
-	cvs status sasl
-	cvs status doc
+	rm -rf stage
+	mkdir stage
+	cd imap && make dist
+	cd apache && make dist
+	cd php && make dist
+	cd openldap && make dist
+	cd imapd && make dist
+	cd postfix && make dist
+	cd perl-kolab && make -f Makefile dist
+	cd kolabd && make dist
+	cd kolab-resource-handlers && make dist
+	cd kolab-webadmin && make dist
 
-diff:
-	cvs diff imapd
-	cvs diff kolab
-	cvs diff openldap
-	cvs diff perl-ldap
-	cvs diff postfix
-	cvs diff proftpd
-	cvs diff sasl
-	cvs diff doc
 
-update:
-	cvs update imapd
-	cvs update kolab
-	cvs update openldap
-	cvs update perl-ldap
-	cvs update postfix
-	cvs update proftpd
-	cvs update sasl
-	cvs update doc

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.174.2.30
retrieving revision 1.174.2.31
diff -u -d -r1.174.2.30 -r1.174.2.31
--- obmtool.conf	10 Jan 2006 16:30:37 -0000	1.174.2.30
+++ obmtool.conf	11 Jan 2006 04:42:40 -0000	1.174.2.31
@@ -9,21 +9,21 @@
 ##
 
 %common
-	@hasfeature TAGFMT USE DEFINE MIRROR DLTOOLS REGISTRY || exit 1
+    @hasfeature TAGFMT USE DEFINE MIRROR DLTOOLS REGISTRY || exit 1
     TMPDIR=/var/tmp                            # large tmp with 300MB space
     URL="ftp://ftp.klaralvdalens-datakonsult.se/pub/kolab/server/current/2.0" # used for non-ftp://ftp.openpkg.org/ packages
-	USERNAME=""
-	for opt in $cmdargs ; do
-        arg=`echo "${opt}" | sed -e 's;^[^=]*=*;;'`
-        opt=`echo "${opt}" | sed -e 's;=.*$;;'`
-		case $opt in
-			-u|--user) USERNAME="$arg";;
-			--url) URL="$arg";;
-        esac
-	done
+    USERNAME=""
+    for opt in $cmdargs ; do
+    	arg=`echo "${opt}" | sed -e 's;^[^=]*=*;;'`
+	opt=`echo "${opt}" | sed -e 's;=.*$;;'`
+	case $opt in
+		-u|--user) USERNAME="$arg";;
+		--url) URL="$arg";;
+    	esac
+    done
 %kolab
     echo "---- boot/build ${NODE} %${CMD} ----"
-    kolab_version="2.0.2";
+    kolab_version="2.0.3-prerelease";
     PREFIX=/${CMD};
     loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
     plusloc='+'
@@ -144,8 +144,8 @@
     @install ${plusloc}dcron-2.9-2.4.0
     @install ${altloc}perl-kolab-5.8.7-2.0_20051219
     @install ${altloc}kolabd-1.9.4-20051219 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-webadmin-0.4.0-20051219 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-resource-handlers-0.3.9-20051222 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-webadmin-0.4.0-20060111 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-resource-handlers-0.3.9-20060111 --define kolab_version=$kolab_version
     @check
 
     if test ! -e "/usr/bin/kolab" ; then



From cvs at intevation.de  Wed Jan 11 05:42:42 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 11 Jan 2006 05:42:42 +0100 (CET)
Subject: steffen: server/apache Makefile,1.16.2.4,1.16.2.5 
Message-ID: <20060111044242.5D1661005DD@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	Makefile 
Log Message:
version + updates Makefiles to build everything from the toplevel

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache/Makefile,v
retrieving revision 1.16.2.4
retrieving revision 1.16.2.5
diff -u -d -r1.16.2.4 -r1.16.2.5
--- Makefile	6 Jan 2006 14:58:36 -0000	1.16.2.4
+++ Makefile	11 Jan 2006 04:42:40 -0000	1.16.2.5
@@ -11,9 +11,11 @@
 PACKAGE=apache
 VERSION=1.3.33
 RELEASE=2.4.5
+KOLABRELEASE=2.4.5_kolab
 
 RPM=/kolab/bin/openpkg rpm
- 
+KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
+
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
@@ -37,6 +39,10 @@
 
 $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
 	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+
+dist: all
+	cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
+
 
 clean:
 	rm -rf /kolab/RPM/TMP/$(PACKAGE)-$(VERSION)* 



From cvs at intevation.de  Wed Jan 11 05:42:42 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 11 Jan 2006 05:42:42 +0100 (CET)
Subject: steffen: server/imapd Makefile,1.22.2.3,1.22.2.4 
Message-ID: <20060111044242.659DA1006AC@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	Makefile 
Log Message:
version + updates Makefiles to build everything from the toplevel

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.22.2.3
retrieving revision 1.22.2.4
diff -u -d -r1.22.2.3 -r1.22.2.4
--- Makefile	17 Sep 2005 22:21:38 -0000	1.22.2.3
+++ Makefile	11 Jan 2006 04:42:40 -0000	1.22.2.4
@@ -11,9 +11,11 @@
 PACKAGE=imapd
 VERSION=2.2.12
 RELEASE=2.4.0
+KOLABRELEASE=2.4.0_kolab3
 
 RPM=/kolab/bin/openpkg rpm
- 
+KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
+
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
@@ -23,13 +25,15 @@
 	cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/$(PACKAGE)/           # Patch for imapd.spec
 	cp $(KOLABCVSDIR)/imapd.group2.patch $(KOLABRPMSRC)/$(PACKAGE)/    # Patch for case insensitive group match
 	cp $(KOLABCVSDIR)/imapd-goodchars.patch $(KOLABRPMSRC)/$(PACKAGE)/ # Patch for allowing special chars in mailbox names
-	cp $(KOLABCVSDIR)/kolab-ldap.patch $(KOLABRPMSRC)/$(PACKAGE)/      
-	
+	cp $(KOLABCVSDIR)/kolab-ldap.patch $(KOLABRPMSRC)/$(PACKAGE)/
 
 	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec --define 'with_group yes' --define 'with_atvdom yes' --define 'with_annotate yes' --define 'with_ldap yes' --define 'with_goodchars yes' --define 'with_morelogging yes'
 
 imapd-$(VERSION)-$(RELEASE).src.rpm:
 	wget -c $(KOLABPKGURI)/imapd-$(VERSION)-$(RELEASE).src.rpm
+
+dist: all
+	cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
 
 clean:
 	rm -rf /kolab/RPM/TMP/cyrus-imapd* cyrus* imapd* rc.imapd vhosthack.patch fsl.imapd groupfile.patch



From cvs at intevation.de  Wed Jan 11 05:42:42 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 11 Jan 2006 05:42:42 +0100 (CET)
Subject: steffen: server/imap Makefile,1.2.2.1,1.2.2.2 
Message-ID: <20060111044242.61C9F1005DE@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	Makefile 
Log Message:
version + updates Makefiles to build everything from the toplevel

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imap/Makefile,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- Makefile	19 Jul 2005 21:00:59 -0000	1.2.2.1
+++ Makefile	11 Jan 2006 04:42:40 -0000	1.2.2.2
@@ -11,19 +11,24 @@
 PACKAGE=imap
 VERSION=2004d
 RELEASE=2.4.0
+KOLABRELEASE=2.4.0_kolab
 
 RPM=/kolab/bin/openpkg rpm
- 
+KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
+
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
 	cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/$(PACKAGE)/           # Patch for imap.spec
 	cp $(KOLABCVSDIR)/imap.annotate.patch $(KOLABRPMSRC)/$(PACKAGE)/   # Patch to add annotate support   
-	
+
 	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec --define 'with_annotate yes'
-	
+
 imap-$(VERSION)-$(RELEASE).src.rpm:
 	wget -c $(KOLABPKGURI)/imap-$(VERSION)-$(RELEASE).src.rpm
+
+dist: all
+	cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
 
 clean:
 	rm -rf /kolab/RPM/TMP/imap-*



From cvs at intevation.de  Wed Jan 11 05:42:42 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 11 Jan 2006 05:42:42 +0100 (CET)
Subject: steffen: server/kolabd Makefile,1.4,1.4.2.1 
Message-ID: <20060111044242.6A7611006AF@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	Makefile 
Log Message:
version + updates Makefiles to build everything from the toplevel

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolabd/Makefile,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- Makefile	28 Apr 2005 00:16:59 -0000	1.4
+++ Makefile	11 Jan 2006 04:42:40 -0000	1.4.2.1
@@ -1,18 +1,24 @@
-RPM = /kolab/bin/openpkg rpm
-VERSION = 1.9.4
-
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
 endif
 
+PACKAGE=kolabd
+VERSION = 1.9.4
+RELEASE=20051219
+
+RPM = /kolab/bin/openpkg rpm
+
 all:
-	test -d $(KOLABRPMSRC)/kolabd || mkdir $(KOLABRPMSRC)/kolabd
-	cd kolabd && tar -cvz --exclude=CVS --exclude=\*~ -f $(KOLABRPMSRC)/kolabd/kolabd-$(VERSION).tar.gz * 
-	cp rc.kolabd kolabd.spec $(KOLABRPMSRC)/kolabd/
-	cd $(KOLABRPMSRC)/kolabd && $(RPM) -ba kolabd.spec --define 'kolab_version CVS'
+	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
+	cd $(PACKAGE) && tar -cvz --exclude=CVS --exclude=\*~ -f $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE)-$(VERSION).tar.gz * 
+	cp rc.kolabd $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)/
+	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec --define 'kolab_version CVS'
 binary:
-	$(RPM) -bB kolabd.spec
+	$(RPM) -bB $(PACKAGE).spec
 
 release:
-	cd kolabd && tar -cvz --exclude=CVS --exclude=\*~ -f ../kolabd-$(VERSION).tar.gz *
-	$(RPM) -ba kolabd.spec
+	cd $(PACKAGE) && tar -cvz --exclude=CVS --exclude=\*~ -f ../$(PACKAGE)-$(VERSION).tar.gz *
+	$(RPM) -ba $(PACKAGE).spec
+
+dist: all
+	cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/



From cvs at intevation.de  Wed Jan 11 05:42:42 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 11 Jan 2006 05:42:42 +0100 (CET)
Subject: steffen: server/openldap Makefile,1.10.2.1,1.10.2.2 
Message-ID: <20060111044242.731E31006B0@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	Makefile 
Log Message:
version + updates Makefiles to build everything from the toplevel

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/openldap/Makefile,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -d -r1.10.2.1 -r1.10.2.2
--- Makefile	19 Jul 2005 21:00:59 -0000	1.10.2.1
+++ Makefile	11 Jan 2006 04:42:40 -0000	1.10.2.2
@@ -11,19 +11,22 @@
 PACKAGE=openldap
 VERSION=2.2.27
 RELEASE=2.4.0
-
+KOLABRELEASE=2.4.0_kolab
 
 RPM=/kolab/bin/openpkg rpm
- 
+KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
+
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-
-	cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/$(PACKAGE)/           # Patch for openldap.spec
-
+	cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/$(PACKAGE)/  # Patch for openldap.spec
 	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec 
 
 $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
 	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+
+dist: all
+	cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
+
 
 clean:
 	rm -rf /kolab/RPM/TMP/$(PACKAGE)



From cvs at intevation.de  Wed Jan 11 05:42:42 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 11 Jan 2006 05:42:42 +0100 (CET)
Subject: steffen: server/perl-kolab Makefile,1.3.2.1,1.3.2.2 
Message-ID: <20060111044242.751DE1006B5@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	Makefile 
Log Message:
version + updates Makefiles to build everything from the toplevel

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Attic/Makefile,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- Makefile	19 Jul 2005 01:32:39 -0000	1.3.2.1
+++ Makefile	11 Jan 2006 04:42:40 -0000	1.3.2.2
@@ -1,11 +1,15 @@
-RPM = /kolab/bin/openpkg rpm
-VERSION = 0.9.2
-
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
 endif
 
-SRCDIR=$(KOLABRPMSRC)/perl-kolab
+PACKAGE=perl-kolab
+VERSION=0.9.2
+PERLVERSION=5.8.7
+RELEASE=2.0_20051219
+
+SRCDIR=$(KOLABRPMSRC)/$(PACKAGE)
+RPM = /kolab/bin/openpkg rpm
+
 
 all:
 	test -d $(SRCDIR) || mkdir $(SRCDIR)
@@ -24,3 +28,6 @@
 	cd $(SRCDIR) && $(RPM) -ba perl-kolab.spec
 binary:
 	$(RPM) -bB perl-kolab.spec
+
+dist: all
+	cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(PERLVERSION)-$(RELEASE).src.rpm ../stage/



From cvs at intevation.de  Wed Jan 11 05:42:42 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 11 Jan 2006 05:42:42 +0100 (CET)
Subject: steffen: server/php Makefile,1.1.2.2,1.1.2.3 
Message-ID: <20060111044242.79CE61006B6@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	Makefile 
Log Message:
version + updates Makefiles to build everything from the toplevel

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php/Makefile,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- Makefile	19 Dec 2005 20:20:27 -0000	1.1.2.2
+++ Makefile	11 Jan 2006 04:42:40 -0000	1.1.2.3
@@ -11,9 +11,11 @@
 PACKAGE=php
 VERSION=4.3.11
 RELEASE=2.4.2
+KOLABRELEASE=2.4.2_kolab
 
 RPM=/kolab/bin/openpkg rpm
- 
+KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
+
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
@@ -35,6 +37,9 @@
 
 $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
 	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+
+dist: all
+	cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
 
 clean:
 	rm -rf /kolab/RPM/TMP/$(PACKAGE)-$(VERSION)* 



From cvs at intevation.de  Wed Jan 11 05:42:42 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 11 Jan 2006 05:42:42 +0100 (CET)
Subject: steffen: server/postfix Makefile,1.11.2.1,1.11.2.2 
Message-ID: <20060111044242.7DA041006B8@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	Makefile 
Log Message:
version + updates Makefiles to build everything from the toplevel

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/postfix/Makefile,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -d -r1.11.2.1 -r1.11.2.2
--- Makefile	19 Jul 2005 21:00:59 -0000	1.11.2.1
+++ Makefile	11 Jan 2006 04:42:40 -0000	1.11.2.2
@@ -8,22 +8,27 @@
   KOLABCVSDIR = $(CURDIR)
 endif
 
+PACKAGE=postfix
 VERSION=2.2.3
 RELEASE=2.4.1
+KOLABRELEASE=2.4.1_kolab
 
 RPM=/kolab/bin/openpkg rpm
- 
-all: postfix-$(VERSION)-$(RELEASE).src.rpm
-	$(RPM) -ihv postfix-$(VERSION)-$(RELEASE).src.rpm
 
-	cp $(KOLABCVSDIR)/postfix-ldap-leafonly.patch $(KOLABRPMSRC)/postfix/
-	cp $(KOLABCVSDIR)/postfix-pipe-allow-empty-sender.patch $(KOLABRPMSRC)/postfix/
-	cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/postfix/           # Patch for postfix.spec
+all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
-	cd $(KOLABRPMSRC)/postfix && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba postfix.spec --define 'with_ldap yes' --define 'with_sasl yes' --define 'with_ssl yes'
+	cp $(KOLABCVSDIR)/postfix-ldap-leafonly.patch $(KOLABRPMSRC)/$(PACKAGE)/
+	cp $(KOLABCVSDIR)/postfix-pipe-allow-empty-sender.patch $(KOLABRPMSRC)/$(PACKAGE)/
+	cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/$(PACKAGE)/           # Patch for postfix.spec
 
-postfix-$(VERSION)-$(RELEASE).src.rpm:
-	wget -c $(KOLABPKGURI)/postfix-$(VERSION)-$(RELEASE).src.rpm
+	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec --define 'with_ldap yes' --define 'with_sasl yes' --define 'with_ssl yes'
+
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
+	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+
+dist: all
+	cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
 
 clean:
 	rm -rf /kolab/RPM/TMP/cyrus-imapd* cyrus* imapd* rc.imapd vhosthack.patch fsl.imapd groupfile.patch



From cvs at intevation.de  Wed Jan 11 07:32:08 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 11 Jan 2006 07:32:08 +0100 (CET)
Subject: steffen: server/kolab-webadmin/kolab-webadmin kolab-webadmin.spec.in,
	1.13, 1.14 
Message-ID: <20060111063208.0DFED1005DC@lists.intevation.de>

Author: steffen

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

Modified Files:
	kolab-webadmin.spec.in 
Log Message:
Update rpm spec to use .bz2

Index: kolab-webadmin.spec.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/kolab-webadmin.spec.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- kolab-webadmin.spec.in	6 Jun 2005 23:47:05 -0000	1.13
+++ kolab-webadmin.spec.in	11 Jan 2006 06:32:06 -0000	1.14
@@ -36,7 +36,7 @@
 
 
 #   list of sources
-Source0:      kolab-webadmin-%{version}.tar.gz
+Source0:      kolab-webadmin-%{version}.tar.bz2
 
 #   build information
 Prefix:       %{l_prefix}



From cvs at intevation.de  Wed Jan 11 15:23:59 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 11 Jan 2006 15:23:59 +0100 (CET)
Subject: bernhard: server/kolabd/kolabd/templates master.cf.template, 1.11.2.2,
	1.11.2.3 main.cf.template, 1.15.2.4, 1.15.2.5 
Message-ID: <20060111142359.2B7511006B0@lists.intevation.de>

Author: bernhard

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

Modified Files:
      Tag: kolab_2_0_branch
	master.cf.template main.cf.template 
Log Message:
Avoiding that postfix will log the password with TLS.
Possibly fixing issue968 (Postfix logs password on failure).


Index: master.cf.template
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/Attic/master.cf.template,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -u -d -r1.11.2.2 -r1.11.2.3
--- master.cf.template	16 Sep 2005 12:37:51 -0000	1.11.2.2
+++ master.cf.template	11 Jan 2006 14:23:57 -0000	1.11.2.3
@@ -33,8 +33,7 @@
 #uucp     unix  -       n       n       -       -       pipe flags=Fqhu user=uucp argv=/kolab/bin/uux -r -n -z -a$sender - $nexthop!rmail ($recipient)
 #ifmail   unix  -       n       n       -       -       pipe flags=F user=ftn argv=/kolab/bin/ifmail -r $nexthop ($recipient)
 #bsmtp    unix  -       n       n       -       -       pipe flags=Fq. user=foo argv=/kolab/bin/bsmtp -f $sender $nexthop $recipient
-465       inet  n       -       n       -       -       smtpd -v -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes 
-#587      inet  n       -       n       -       -       smtpd -v -o smtpd_enforce_tls=yes -o smtpd_sasl_auth_enable=yes
+465       inet  n       -       n       -       -       smtpd -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes 
 post-cleanup unix  n    -       n       -       0       cleanup -o virtual_maps=
 smtp-amavis unix -	-	n	-	2       smtp
     -o smtp_data_done_timeout=1200

Index: main.cf.template
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/Attic/main.cf.template,v
retrieving revision 1.15.2.4
retrieving revision 1.15.2.5
diff -u -d -r1.15.2.4 -r1.15.2.5
--- main.cf.template	12 Oct 2005 11:04:16 -0000	1.15.2.4
+++ main.cf.template	11 Jan 2006 14:23:57 -0000	1.15.2.5
@@ -78,7 +78,7 @@
 #smtpd_tls_dkey_file = $smtpd_tls_dcert_file
 #smtpd_tls_key_file = $smtpd_tls_cert_file
 smtpd_tls_key_file = @l_prefix@/etc/kolab/key.pem
-#smtpd_tls_loglevel = 3
+smtpd_tls_loglevel = 1
 smtpd_tls_received_header = no
 #smtpd_tls_req_ccert = no
 #smtpd_tls_session_cache_database =



From cvs at intevation.de  Wed Jan 11 15:37:31 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 11 Jan 2006 15:37:31 +0100 (CET)
Subject: bernhard: server/kolabd/kolabd/templates amavisd.conf.template, 1.6,
	1.6.2.1 
Message-ID: <20060111143731.110181006B0@lists.intevation.de>

Author: bernhard

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

Modified Files:
      Tag: kolab_2_0_branch
	amavisd.conf.template 
Log Message:
Adding an example line for the German templates to make it easier for admins.


Index: amavisd.conf.template
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/Attic/amavisd.conf.template,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- amavisd.conf.template	20 May 2005 00:39:25 -0000	1.6
+++ amavisd.conf.template	11 Jan 2006 14:37:29 -0000	1.6.2.1
@@ -331,6 +331,7 @@
 # use read_l10n_templates which calls read_text for each known template.
 #
 read_l10n_templates('@l_prefix@/etc/amavisd/templates/en_US');
+#read_l10n_templates('@l_prefix@/etc/amavisd/templates/de');
 
 
 # Here is an overall picture (sequence of events) of how pieces fit together



From cvs at intevation.de  Wed Jan 11 15:40:43 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 11 Jan 2006 15:40:43 +0100 (CET)
Subject: bernhard: server/kolabd/kolabd/templates main.cf.template.in, 1.6,
	1.7 master.cf.template.in, 1.6, 1.7 
Message-ID: <20060111144043.D2BBF1006B0@lists.intevation.de>

Author: bernhard

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

Modified Files:
	main.cf.template.in master.cf.template.in 
Log Message:
Fix for issue968(Postfix logs password for ssl port 465).
	* Removed "-v" option from smtpd on port 465.
	* Added smtpd_tls_loglevel = 1 so that TLS connects are logged.


Index: main.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- main.cf.template.in	30 Nov 2005 01:19:04 -0000	1.6
+++ main.cf.template.in	11 Jan 2006 14:40:41 -0000	1.7
@@ -95,7 +95,7 @@
 #smtpd_tls_dkey_file = $smtpd_tls_dcert_file
 #smtpd_tls_key_file = $smtpd_tls_cert_file
 smtpd_tls_key_file = @sysconfdir@/kolab/key.pem
-#smtpd_tls_loglevel = 3
+smtpd_tls_loglevel = 1
 smtpd_tls_received_header = no
 #smtpd_tls_req_ccert = no
 #smtpd_tls_session_cache_database =

Index: master.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- master.cf.template.in	30 Nov 2005 02:42:03 -0000	1.6
+++ master.cf.template.in	11 Jan 2006 14:40:41 -0000	1.7
@@ -39,8 +39,7 @@
 #uucp     unix  -       n       n       -       -       pipe flags=Fqhu user=uucp argv=@bindir@/uux -r -n -z -a$sender - $nexthop!rmail ($recipient)
 #ifmail   unix  -       n       n       -       -       pipe flags=F user=ftn argv=@bindir@/ifmail -r $nexthop ($recipient)
 #bsmtp    unix  -       n       n       -       -       pipe flags=Fq. user=foo argv=@bindir@/bsmtp -f $sender $nexthop $recipient
-465       inet  n       -       n       -       -       smtpd -v -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes 
-#587      inet  n       -       n       -       -       smtpd -v -o smtpd_enforce_tls=yes -o smtpd_sasl_auth_enable=yes
+465       inet  n       -       n       -       -       smtpd -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes 
 post-cleanup unix  n    -       n       -       0       cleanup -o virtual_maps=
 smtp-amavis unix -	-	n	-	2       smtp
     -o smtp_data_done_timeout=1200



From cvs at intevation.de  Wed Jan 11 15:49:07 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 11 Jan 2006 15:49:07 +0100 (CET)
Subject: bernhard: server/kolabd/kolabd/templates amavisd.conf.template.in, 1.3,
	1.4 
Message-ID: <20060111144907.2D4781005D9@lists.intevation.de>

Author: bernhard

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

Modified Files:
	amavisd.conf.template.in 
Log Message:
Adding an example line for the German templates to make it easier for admins.


Index: amavisd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/amavisd.conf.template.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- amavisd.conf.template.in	9 Dec 2005 16:02:16 -0000	1.3
+++ amavisd.conf.template.in	11 Jan 2006 14:49:05 -0000	1.4
@@ -336,6 +336,7 @@
 # use read_l10n_templates which calls read_text for each known template.
 #
 read_l10n_templates('@amavisd_confdir@/templates/en_US');
+#read_l10n_templates('@amavisd_confdir@/templates/de');
 
 
 # Here is an overall picture (sequence of events) of how pieces fit together



From cvs at intevation.de  Wed Jan 11 16:02:26 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 11 Jan 2006 16:02:26 +0100 (CET)
Subject: bernhard: doc/www/src mirrors.html.m4,1.12,1.13 
Message-ID: <20060111150226.A86A51005D9@lists.intevation.de>

Author: bernhard

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

Modified Files:
	mirrors.html.m4 
Log Message:
linjection has the server again.


Index: mirrors.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/mirrors.html.m4,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- mirrors.html.m4	8 Jan 2006 12:19:10 -0000	1.12
+++ mirrors.html.m4	11 Jan 2006 15:02:24 -0000	1.13
@@ -13,7 +13,7 @@
   via <a href="http://ftp.belnet.be/packages/kolab/">http</a> |
   <a href="ftp://ftp.belnet.be/packages/kolab/">ftp</a>
 <li>
-  <b>Linjection</b> (might lack stable server releases) <br> 
+  <b>Linjection</b><br> 
   via
   <a href="http://kolab.linjection.org/">http</a>
 </ul>



From cvs at intevation.de  Wed Jan 11 16:51:36 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 11 Jan 2006 16:51:36 +0100 (CET)
Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user
	user.php.in, 1.1, 1.2 
Message-ID: <20060111155136.137731006C2@lists.intevation.de>

Author: steffen

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

Modified Files:
	user.php.in 
Log Message:
Fix for issue848 (deleting users problem with distlists)

Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- user.php.in	30 Dec 2005 11:07:18 -0000	1.1
+++ user.php.in	11 Jan 2006 15:51:34 -0000	1.2
@@ -781,14 +781,17 @@
 	 if( !$dlmail ) $dlmail = $distlist['cn'][0]; # Compatibility with old stuff
 	 if( $distlist['member']['count'] == 1 ) {
 	   $errors[] = sprintf(_("Account could not be deleted, distribution list '%s' depends on it."), $dlmail);
+	 }
+   }
+   if( !$errors ) foreach( $distlists as $distlist ) {
+	 $dlmail = $distlist['mail'][0];
+	 if( !$dlmail ) $dlmail = $distlist['cn'][0]; # Compatibility with old stuff
+	 if( ldap_mod_del( $ldap->connection, $distlist['dn'], array('member' => $dn ) ) ) {
+	   $messages[] = sprintf(_("Account removed from distribution list '%s'."), $dlmail);
 	 } else {
-	   if( ldap_mod_del( $ldap->connection, $distlist['dn'], array('member' => $dn ) ) ) {
-		 $messages[] = sprintf(_("Account removed from distribution list '%s'."), $dlmail);
-	   } else {
-		 $errors[] = sprintf(_("Failure to remove account from distribution list '', account will not be deleted."),
-							 $dlmail);
-		 break;
-	   }
+	   $errors[] = sprintf(_("Failure to remove account from distribution list '', account will not be deleted."),
+						   $dlmail);
+	   break;
 	 }
    }
 



From cvs at intevation.de  Wed Jan 11 16:54:27 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 11 Jan 2006 16:54:27 +0100 (CET)
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr
	kolabfilter.php.in, 1.4, 1.5 
Message-ID: <20060111155427.8D1E61006C2@lists.intevation.de>

Author: steffen

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

Modified Files:
	kolabfilter.php.in 
Log Message:
Better formatting

Index: kolabfilter.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabfilter.php.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kolabfilter.php.in	22 Dec 2005 22:36:15 -0000	1.4
+++ kolabfilter.php.in	11 Jan 2006 15:54:25 -0000	1.5
@@ -215,7 +215,7 @@
 	  } else {
 	    /* Rewrite */
 	    myLog("$from is not an allowed From address for unauthenticated users, rewriting", RM_LOG_DEBUG);
-	    return '"'.$adr->personal.'(UNTRUSTED, sender is \"'.$sender>'\") '.'<'.$from.'>';
+	    return '"'.$adr->personal.'(UNTRUSTED, sender is <'.$sender.'>)" '.'<'.$from.'>';
 	  }
 	}
       }



From cvs at intevation.de  Wed Jan 11 17:15:19 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 11 Jan 2006 17:15:19 +0100 (CET)
Subject: bh: server/kolabd kolabd.spec, 1.57.2.9, 1.57.2.10 Makefile, 1.4.2.1,
	1.4.2.2 
Message-ID: <20060111161519.A89A21006BF@lists.intevation.de>

Author: bh

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

Modified Files:
      Tag: kolab_2_0_branch
	kolabd.spec Makefile 
Log Message:
new kolabd package with the fix for Issue968


Index: kolabd.spec
===================================================================
RCS file: /kolabrepository/server/kolabd/Attic/kolabd.spec,v
retrieving revision 1.57.2.9
retrieving revision 1.57.2.10
diff -u -d -r1.57.2.9 -r1.57.2.10
--- kolabd.spec	19 Dec 2005 20:20:27 -0000	1.57.2.9
+++ kolabd.spec	11 Jan 2006 16:15:17 -0000	1.57.2.10
@@ -40,7 +40,7 @@
 Group:        Mail
 License:      GPL
 Version:      1.9.4
-Release:      20051219
+Release:      20060111
 
 #   list of sources
 Source0:      kolabd-1.9.4.tar.gz

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolabd/Makefile,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -d -r1.4.2.1 -r1.4.2.2
--- Makefile	11 Jan 2006 04:42:40 -0000	1.4.2.1
+++ Makefile	11 Jan 2006 16:15:17 -0000	1.4.2.2
@@ -4,7 +4,7 @@
 
 PACKAGE=kolabd
 VERSION = 1.9.4
-RELEASE=20051219
+RELEASE=20060111
 
 RPM = /kolab/bin/openpkg rpm
 



From cvs at intevation.de  Wed Jan 11 17:15:19 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 11 Jan 2006 17:15:19 +0100 (CET)
Subject: bh: server obmtool.conf,1.174.2.31,1.174.2.32 
Message-ID: <20060111161519.B4DE51006C2@lists.intevation.de>

Author: bh

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

Modified Files:
      Tag: kolab_2_0_branch
	obmtool.conf 
Log Message:
new kolabd package with the fix for Issue968


Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.174.2.31
retrieving revision 1.174.2.32
diff -u -d -r1.174.2.31 -r1.174.2.32
--- obmtool.conf	11 Jan 2006 04:42:40 -0000	1.174.2.31
+++ obmtool.conf	11 Jan 2006 16:15:17 -0000	1.174.2.32
@@ -143,7 +143,7 @@
     @install ${loc}vim-6.3.78-2.4.0
     @install ${plusloc}dcron-2.9-2.4.0
     @install ${altloc}perl-kolab-5.8.7-2.0_20051219
-    @install ${altloc}kolabd-1.9.4-20051219 --define kolab_version=$kolab_version
+    @install ${altloc}kolabd-1.9.4-20060111 --define kolab_version=$kolab_version
     @install ${altloc}kolab-webadmin-0.4.0-20060111 --define kolab_version=$kolab_version
     @install ${altloc}kolab-resource-handlers-0.3.9-20060111 --define kolab_version=$kolab_version
     @check



From cvs at intevation.de  Wed Jan 11 17:16:08 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 11 Jan 2006 17:16:08 +0100 (CET)
Subject: bh: server release-notes.txt, 1.15.2.13, 1.15.2.14 README.1st,
	1.23.2.8, 1.23.2.9 
Message-ID: <20060111161608.6BF151006BF@lists.intevation.de>

Author: bh

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

Modified Files:
      Tag: kolab_2_0_branch
	release-notes.txt README.1st 
Log Message:
update for the 2.0.3 release


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.15.2.13
retrieving revision 1.15.2.14
diff -u -d -r1.15.2.13 -r1.15.2.14
--- release-notes.txt	8 Jan 2006 12:21:22 -0000	1.15.2.13
+++ release-notes.txt	11 Jan 2006 16:16:06 -0000	1.15.2.14
@@ -1,70 +1,40 @@
 Release notes Kolab2 Server
-(Version 20060106, Kolab Server 2.0.2)
+(Version 20060111, Kolab Server 2.0.3)
 
 
 For upgrading and installation instructions, please refer to the
 1st.README file in the source directory.
 
-Changes since 2.0.1:
-
-    - Security fixes from OpenPKG:
-      http://www.openpkg.org/security/OpenPKG-SA-2005.025-perl.html
-      http://www.openpkg.org/security/OpenPKG-SA-2005.027-php.html
-      http://www.openpkg.org/security/OpenPKG-SA-2005.029-apache.html
+This release fixes an important bug introduced in 2.0.2 (users couldn't
+be deleted) and fixes two security problems (one in clamav and one in
+the default configuration of Kolab's postfix).  
 
-    - This release includes the kolab security updates released since
-      version 2.0.1:
-      http://kolab.org/security/kolab-vendor-notice-03.txt	
-      http://kolab.org/security/kolab-vendor-notice-04.txt
-      http://kolab.org/security/kolab-vendor-notice-05.txt
-      http://kolab.org/security/kolab-vendor-notice-06.txt
-      http://kolab.org/security/kolab-vendor-notice-07.txt
+Upgrading is recommended.
 
-    - support for the new registration required by OpenPKG for updates.
 
-    - kolabd 1.9.4-20050913 -> 1.9.4-20051219
+Changes since 2.0.2:
 
-      * changed postfix relayhost LDAP attributes
+    - Security Fixes:
 
-      * Fixing:
-          Issue779 (correct headers for encoding in quota warning mails)
-          Issue826 (too many decimal digits in quota values in warning mails)
-          Issue832 (basedn with spaces problematic in master.cf)
-	  Issue921 (kolabquotawarn may send warnings for users with 0% quota)
-	  Issue919 (non-escaped shell metachars in passwd)
+      clamav-0.88-20060110
 
-    - kolab-resource-handlers 0.3.9-20050912 -> 0.3.9-20051222
+    - kolabd 1.9.4-20051219 -> 1.9.4-20060111
 
       * Fixing:
-          Issue952 (mailto: required in ical rewritten by kolabfilter)
-	  Issue958 (From: rewritten twice when mail is relayed between servers)
-	  Issue1042 (server modifies email attachment content)
+          Issue968 (Postfix logs password for ssl port 465)
 
-    - kolab-webadmin 0.4.0-20050831 -> 0.4.0-20051219
 
-      Updated translations: Italian, German
+    - kolab-resource-handlers 0.3.9-20050912 -> 0.3.9-20060111
 
       * Fixing:
-          Issue820 (error when re-adding distribution list)
-	  Issue942 (postfix relayhost parameter syntax changed)
-	  Issue886 (i18n problem)
-	  Issue960 (extra newlines in vacation text)
+          Issue973 (Rewritten from shown inconveniently in kontact)
 
-    - perl-kolab 5.8.7-2.0_20050912 -> 5.8.7-2.0_20051219
 
-      * Add the password and ID fields again to the generated
-        imapd.groups.
+    - kolab-webadmin 0.4.0-20051219 -> 0.4.0-20060111
 
       * Fixing:
-          Issue832 (basedn with spaces problematic in master.cf)
-          Issue801 (lowercase value of mail attr)
-	  Issue882 (mailbox creation for external users)
-	  Issue961 (kolabd confused by unauthorized connection, possible fix)
+          Issue848 (Deleting user should remove them from distribution lists)
 
-    - imapd 2.2.12-2.4.0_kolab2 -> imapd-2.2.12-2.4.0_kolab3
-    
-      * Fixing:
-          Issue928 (imapd logging for mail deletion/creation)
 
 
 

Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.23.2.8
retrieving revision 1.23.2.9
diff -u -d -r1.23.2.8 -r1.23.2.9
--- README.1st	6 Jan 2006 15:22:06 -0000	1.23.2.8
+++ README.1st	11 Jan 2006 16:16:06 -0000	1.23.2.9
@@ -274,5 +274,10 @@
 There's nothing special to be done.
 
 
+Upgrade from 2.0.1 to 2.0.2
+---------------------------
+
+There's nothing special to be done.
+
 
 $Id$



From cvs at intevation.de  Wed Jan 11 17:26:18 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 11 Jan 2006 17:26:18 +0100 (CET)
Subject: bh: server obmtool.conf,1.174.2.32,1.174.2.33 
Message-ID: <20060111162618.3731A1006C4@lists.intevation.de>

Author: bh

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

Modified Files:
      Tag: kolab_2_0_branch
	obmtool.conf 
Log Message:
Update for 2.0.3


Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.174.2.32
retrieving revision 1.174.2.33
diff -u -d -r1.174.2.32 -r1.174.2.33
--- obmtool.conf	11 Jan 2006 16:15:17 -0000	1.174.2.32
+++ obmtool.conf	11 Jan 2006 16:26:16 -0000	1.174.2.33
@@ -23,7 +23,7 @@
     done
 %kolab
     echo "---- boot/build ${NODE} %${CMD} ----"
-    kolab_version="2.0.3-prerelease";
+    kolab_version="2.0.3";
     PREFIX=/${CMD};
     loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
     plusloc='+'



From cvs at intevation.de  Wed Jan 11 17:26:36 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 11 Jan 2006 17:26:36 +0100 (CET)
Subject: bh: server README.1st,1.23.2.9,1.23.2.10 
Message-ID: <20060111162636.170E61006C2@lists.intevation.de>

Author: bh

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

Modified Files:
      Tag: kolab_2_0_branch
	README.1st 
Log Message:
Fix the update for the 2.0.3 release


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.23.2.9
retrieving revision 1.23.2.10
diff -u -d -r1.23.2.9 -r1.23.2.10
--- README.1st	11 Jan 2006 16:16:06 -0000	1.23.2.9
+++ README.1st	11 Jan 2006 16:26:34 -0000	1.23.2.10
@@ -274,7 +274,7 @@
 There's nothing special to be done.
 
 
-Upgrade from 2.0.1 to 2.0.2
+Upgrade from 2.0.2 to 2.0.3
 ---------------------------
 
 There's nothing special to be done.



From cvs at intevation.de  Wed Jan 11 21:31:40 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 11 Jan 2006 21:31:40 +0100 (CET)
Subject: steffen: server/kolabd/kolabd kolabquotawarn.in,1.6,1.7 
Message-ID: <20060111203140.347751006B6@lists.intevation.de>

Author: steffen

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

Modified Files:
	kolabquotawarn.in 
Log Message:
Fix for Issue1012 (quota warnings logged)

Index: kolabquotawarn.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabquotawarn.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- kolabquotawarn.in	10 Dec 2005 21:57:11 -0000	1.6
+++ kolabquotawarn.in	11 Jan 2006 20:31:38 -0000	1.7
@@ -107,7 +107,7 @@
   fatal_exit( "Can't open quotawarning.txt" );
 }
 
-dbmopen( %quotawarn_db, '@localstatedir@/kolab/quotawarn.db', 0666 ) 
+dbmopen( %quotawarn_db, '@localstatedir@/kolab/quotawarn.db', 0666 )
   || fatal_exit ('Unable to open quotawarn db');
 
 if( $opt_d ) {
@@ -140,7 +140,11 @@
 				data => $msg );
   $mail->print if $opt_d;
   my $mailer = Mail::Transport::SMTP->new();
-  $mailer->send( $mail );
+  if( $mailer->send( $mail ) ) {
+    mylog("info", "info: Sent quota warning message to $user because quota is at $pct%");
+  } else {
+    mylog("err", "error: Failed sent quota warning message to $user");
+  }
 }
 
 sub kolablistquotas {



From cvs at intevation.de  Wed Jan 11 21:44:51 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 11 Jan 2006 21:44:51 +0100 (CET)
Subject: steffen: server/kolabd/kolabd kolabquotawarn,1.3.2.6,1.3.2.7 
Message-ID: <20060111204451.C39E11006C4@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	kolabquotawarn 
Log Message:
Fix for Issue1012 (quota warnings logged)

Index: kolabquotawarn
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Attic/kolabquotawarn,v
retrieving revision 1.3.2.6
retrieving revision 1.3.2.7
diff -u -d -r1.3.2.6 -r1.3.2.7
--- kolabquotawarn	4 Nov 2005 19:47:52 -0000	1.3.2.6
+++ kolabquotawarn	11 Jan 2006 20:44:49 -0000	1.3.2.7
@@ -140,7 +140,11 @@
 				data => $msg );
   $mail->print if $opt_d;
   my $mailer = Mail::Transport::SMTP->new();
-  $mailer->send($mail);
+  if( $mailer->send( $mail ) ) {
+    mylog("info", "info: Sent quota warning message to $user because quota is at $pct%");
+  } else {
+    mylog("err", "error: Failed sent quota warning message to $user");
+  }
 }
 
 sub kolablistquotas {



From cvs at intevation.de  Wed Jan 11 23:45:24 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 11 Jan 2006 23:45:24 +0100 (CET)
Subject: steffen: server Makefile,1.7,1.8 obmtool.conf,1.212,1.213 
Message-ID: <20060111224524.B7DA81006C4@lists.intevation.de>

Author: steffen

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

Modified Files:
	Makefile obmtool.conf 
Log Message:
added smarty to build

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile	20 Dec 2005 19:49:26 -0000	1.7
+++ Makefile	11 Jan 2006 22:45:22 -0000	1.8
@@ -12,6 +12,8 @@
 	cd kolab-horde-framework && make dist
 	cd kolab-horde-fbview && make dist
 	cd kolab-resource-handlers && make dist
+	cd php-smarty && make dist
 	cd kolab-webadmin && make dist
-
+	cd stage && wget -c `/kolab/bin/openpkg register -R ftp://ftp.openpkg.org/current/SRC/clamav-0.88-20060110.src.rpm`
+	cd stage && cp ../obmtool ../obmtool.conf ../README.1st . && echo "Remember to update obmtool.conf!"
 

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -d -r1.212 -r1.213
--- obmtool.conf	21 Dec 2005 01:32:36 -0000	1.212
+++ obmtool.conf	11 Jan 2006 22:45:22 -0000	1.213
@@ -144,7 +144,7 @@
 	--with=dom \
 	--with=ssl \
 	--with=mbstring
-    @install ${altloc}php-smarty-2.6.3-20040702
+    @install ${altloc}php-smarty-2.6.10-20051003
     @install ${loc}gmp-4.1.4-2.5.0
     @install ${loc}spamassassin-3.1.0-2.5.0
     @install ${plusloc}amavisd-2.3.3-2.5.0



From cvs at intevation.de  Thu Jan 12 15:17:17 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu, 12 Jan 2006 15:17:17 +0100 (CET)
Subject: bernhard: doc/www/src index.html.m4,1.72,1.73 
Message-ID: <20060112141717.8EA511006D1@lists.intevation.de>

Author: bernhard

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

Modified Files:
	index.html.m4 
Log Message:
Added Server 2.0.3 release.


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- index.html.m4	8 Jan 2006 12:04:44 -0000	1.72
+++ index.html.m4	12 Jan 2006 14:17:15 -0000	1.73
@@ -48,13 +48,13 @@
 <table>
 <tr><td class="newsd">January 6th, 2006</td>
 <td class="newsh">&raquo;
-	Stable server 2.0.2 maintenance release.
+	Stable server 2.0.3 security release.
 </td></tr>
 </table>
 <div class="newsb">
-	Accumulating the recent security fixes and a couple of minor
-	bugfixes done over the last months, Kolab Server edition 2.0.2
-	is now available from your favourite mirror.
+	Three critical problems came up basically at the same time and
+	triggered the release of Kolab Server 2.0.3 fixing them.
+	If you run a Kolab Server, we strongly recommend updating.
 </div>
 <p>
 
@@ -64,6 +64,19 @@
 
 <!-- BEGIN NEWS BLOCK --> <div class="news">
 
+
+<table>
+<tr><td class="newsd">January 11th, 2006</td>
+<td class="newsh">&raquo;
+	Stable server 2.0.2 maintenance release.
+</td></tr>
+</table>
+<div class="newsb">
+	Accumulating the recent security fixes and a couple of minor
+	bugfixes done over the last months, Kolab Server edition 2.0.2
+	is now available from your favourite mirror.
+</div>
+<p>
 
 <table>
 <tr><td class="newsd">December 22nd, 2005</td>



From cvs at intevation.de  Thu Jan 12 21:27:24 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu, 12 Jan 2006 21:27:24 +0100 (CET)
Subject: bernhard: doc/www/src/security kolab-vendor-notice-08.txt,NONE,1.1 
Message-ID: <20060112202724.49A731006CD@lists.intevation.de>

Author: bernhard

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

Added Files:
	kolab-vendor-notice-08.txt 
Log Message:
Added kolab-vendor-notice-08 draft.


--- NEW FILE: kolab-vendor-notice-08.txt ---
Kolab Security Issue 08 20060113
================================

Package:              Kolab Server
Vulnerability:        Verbose logging for connections to port 465 (ssmtp)
		      includes the credentials of the connecting users.
		      Passwords might leak through this.
Kolab Specific:       yes
Impact:               high


Details
-------

Clients that connect to port 465 for secure SMTP and try to authenticate 
itself, will have the credentials logged in /kolab/var/postfix/log/postfix.log.
To make use of this, other untrusted unix users must exist on the server
machine that find can read the file. 
In this case the clear text user passwords can be learned from the logfile.

Note that usually postfix.log is world readable with permissions 0644.
You can change this with chmod and in /kolab/etc/fsl/fsl.postfix.

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

Vulnerable: Stable Kolab Servers 2.0.1 2.0.2  
Untested: Kolab Server 2.0

Vulnerable: Development Kolab Servers <= pre-2.1-20051215

Fixes
-----

Upgrade to Kolab Server 2.0.3

Alternatively: Remove the "-v" option from the line starting with "465"
in the master.cf.template and then run kolabconf to refresh postfix.

Timeline
--------
2005-11-02 Issue968 was filed, assumed logging only on failure.
2005-12-19 Discovered that logging happened alway.
2006-01-04 Security implications of world readable logfile noticed.
2006-01-11 Analysis, fix and new server release with fix.
2006-01-13 Advisory published.



From cvs at intevation.de  Thu Jan 12 22:05:30 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu, 12 Jan 2006 22:05:30 +0100 (CET)
Subject: bh: doc/www/src/security kolab-vendor-notice-08.txt,1.1,1.2 
Message-ID: <20060112210530.677E81005C6@lists.intevation.de>

Author: bh

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

Modified Files:
	kolab-vendor-notice-08.txt 
Log Message:
rephrase the description a bit.


Index: kolab-vendor-notice-08.txt
===================================================================
RCS file: /kolabrepository/doc/www/src/security/kolab-vendor-notice-08.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab-vendor-notice-08.txt	12 Jan 2006 20:27:22 -0000	1.1
+++ kolab-vendor-notice-08.txt	12 Jan 2006 21:05:28 -0000	1.2
@@ -12,11 +12,11 @@
 Details
 -------
 
-Clients that connect to port 465 for secure SMTP and try to authenticate 
-itself, will have the credentials logged in /kolab/var/postfix/log/postfix.log.
-To make use of this, other untrusted unix users must exist on the server
-machine that find can read the file. 
-In this case the clear text user passwords can be learned from the logfile.
+With the default configuration of the Kolab server, when a client
+connects to port 465 for secure SMTP and tries to authenticate itself
+the credentials will be logged in /kolab/var/postfix/log/postfix.log.
+Other unix users on the server system may be able to read that file and
+learn passwords from it.
 
 Note that usually postfix.log is world readable with permissions 0644.
 You can change this with chmod and in /kolab/etc/fsl/fsl.postfix.



From cvs at intevation.de  Fri Jan 13 20:35:12 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri, 13 Jan 2006 20:35:12 +0100 (CET)
Subject: bh: doc/www/src/security kolab-vendor-notice-08.txt,1.2,1.3 
Message-ID: <20060113193512.3C4391006CF@lists.intevation.de>

Author: bh

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

Modified Files:
	kolab-vendor-notice-08.txt 
Log Message:
sign the security notice


Index: kolab-vendor-notice-08.txt
===================================================================
RCS file: /kolabrepository/doc/www/src/security/kolab-vendor-notice-08.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolab-vendor-notice-08.txt	12 Jan 2006 21:05:28 -0000	1.2
+++ kolab-vendor-notice-08.txt	13 Jan 2006 19:35:10 -0000	1.3
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 Kolab Security Issue 08 20060113
 ================================
 
@@ -10,7 +13,7 @@
 
 
 Details
--------
+- -------
 
 With the default configuration of the Kolab server, when a client
 connects to port 465 for secure SMTP and tries to authenticate itself
@@ -22,7 +25,7 @@
 You can change this with chmod and in /kolab/etc/fsl/fsl.postfix.
 
 Affected Versions
------------------
+- -----------------
 
 Vulnerable: Stable Kolab Servers 2.0.1 2.0.2  
 Untested: Kolab Server 2.0
@@ -30,7 +33,7 @@
 Vulnerable: Development Kolab Servers <= pre-2.1-20051215
 
 Fixes
------
+- -----
 
 Upgrade to Kolab Server 2.0.3
 
@@ -38,9 +41,16 @@
 in the master.cf.template and then run kolabconf to refresh postfix.
 
 Timeline
---------
+- --------
 2005-11-02 Issue968 was filed, assumed logging only on failure.
 2005-12-19 Discovered that logging happened alway.
 2006-01-04 Security implications of world readable logfile noticed.
 2006-01-11 Analysis, fix and new server release with fix.
 2006-01-13 Advisory published.
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.5 (GNU/Linux)
+
+iD8DBQFDyADQ0vCiU5+ISsgRAgfsAJ0bqau6XerXsXk5VIO4L0rOT+DK1ACcDY4l
+919ok7QQhuz/ntulPfNugKA=
+=vTb2
+-----END PGP SIGNATURE-----



From cvs at intevation.de  Fri Jan 13 20:37:10 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri, 13 Jan 2006 20:37:10 +0100 (CET)
Subject: bh: doc/www/src index.html.m4,1.73,1.74 
Message-ID: <20060113193710.6CAFB1006CF@lists.intevation.de>

Author: bh

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

Modified Files:
	index.html.m4 
Log Message:
Update for Security Advisory 08


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- index.html.m4	12 Jan 2006 14:17:15 -0000	1.73
+++ index.html.m4	13 Jan 2006 19:37:08 -0000	1.74
@@ -46,15 +46,34 @@
 <!-- BEGIN LATEST BLOCK --> <div class="latestnews">
 
 <table>
-<tr><td class="newsd">January 6th, 2006</td>
+<tr><td class="newsd">January 13th, 2005</td>
+<td class="newsh">&raquo;
+	Security Advisory 08 for Kolab Server
+</td></tr>
+</table>
+<div class="newsb">
+        With the default configuration of the Kolab server, passwords
+	used for authenticated SMTP are written to a logfile in some
+	circumstances.  See the
+	<a href="security/kolab-vendor-notice-08.txt">Kolab Security
+	Advisory 08</a> for details.  Note that the new stable server
+	release, 2.0.3 already contains the fix for this problem.
+</div>
+<p>
+
+<table>
+<tr><td class="newsd">January 11th, 2006</td>
 <td class="newsh">&raquo;
 	Stable server 2.0.3 security release.
 </td></tr>
 </table>
 <div class="newsb">
 	Three critical problems came up basically at the same time and
-	triggered the release of Kolab Server 2.0.3 fixing them.
-	If you run a Kolab Server, we strongly recommend updating.
+	triggered the release of Kolab Server 2.0.3 fixing them.  See
+	the <a href="security/kolab-vendor-notice-08.txt">Kolab Security
+	Advisory 08</a> for details on one of the problems fixed by this
+	release.  If you run a Kolab Server, we strongly recommend
+	updating.
 </div>
 <p>
 



From cvs at intevation.de  Sat Jan 14 22:21:17 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat, 14 Jan 2006 22:21:17 +0100 (CET)
Subject: richard: server/perl-kolab ChangeLog,1.10,1.11 
Message-ID: <20060114212117.81B2D1005AA@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
* Kolab/Kolab.pm.in: check for valid uid/gid values with perl define
  instead of the value.  The current check failed for root, as that
  returns '0' (zero) that was interpreted as false...
* Changed the real login names, kolab, kolab-n and kolab-r to resp.
  @kolab_mgrp@, @kolab_usr@ and @kolab_rusr at .  The same thing
  was done for the groups



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ChangeLog	7 Jan 2006 21:10:20 -0000	1.10
+++ ChangeLog	14 Jan 2006 21:21:15 -0000	1.11
@@ -1,3 +1,11 @@
+2006-01-14 Richard Bos <richard at radoeka.nl>
+	* Kolab/Kolab.pm.in: check for valid uid/gid values with perl define
+	  instead of the value.  The current check failed for root, as that
+	  returns '0' (zero) that was interpreted as false...
+	* Changed the real login names, kolab, kolab-n and kolab-r to resp.
+	  @kolab_mgrp@, @kolab_usr@ and @kolab_rusr at .  The same thing
+	  was done for the groups
+
 2006-01-07 Richard Bos <richard at radoeka.nl>
 	* Kolab-Conf/Conf.pm.in: do not crash when the file to be checked
 	  does not exists.



From cvs at intevation.de  Sat Jan 14 22:21:17 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat, 14 Jan 2006 22:21:17 +0100 (CET)
Subject: richard: server/perl-kolab/Kolab Kolab.pm.in,1.2,1.3 
Message-ID: <20060114212117.834881005C7@lists.intevation.de>

Author: richard

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

Modified Files:
	Kolab.pm.in 
Log Message:
* Kolab/Kolab.pm.in: check for valid uid/gid values with perl define
  instead of the value.  The current check failed for root, as that
  returns '0' (zero) that was interpreted as false...
* Changed the real login names, kolab, kolab-n and kolab-r to resp.
  @kolab_mgrp@, @kolab_usr@ and @kolab_rusr at .  The same thing
  was done for the groups



Index: Kolab.pm.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab/Kolab.pm.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Kolab.pm.in	30 Dec 2005 10:32:05 -0000	1.2
+++ Kolab.pm.in	14 Jan 2006 21:21:15 -0000	1.3
@@ -81,9 +81,10 @@
     # so we don't use $tempval for anything other than storing it in
     # $config{'prefix'}. Once prefix is not in use anywhere, we can remove
     # this code. /steffen
-    if (!($tempval = (getpwnam('kolab'))[7])) {
+    $tempval = (getpwnam('@kolab_musr@'))[7];
+    if (! defined $tempval) {
         $config{'log_level'} = KOLAB_WARN;
-        &log('C', 'Unable to determine the kolab root directory', KOLAB_ERROR);	
+        &log('C', 'Unable to determine the kolab user main directory', KOLAB_ERROR);	
 	$error = 1;
     } else {
         %config = readConfig(%config, "@sysconfdir@/kolab/kolab.globals");
@@ -96,29 +97,40 @@
 #    $config{'log_level'} = KOLAB_WARN if (!exists $config{'log_level'});
     &log('C', 'Reloading configuration');
 
-    # Get the UID/GID of the `kolab' user
-    if (!($config{'kolab_uid'} = (getpwnam('kolab'))[2])) {
-        &log('C', "Unable to determine the uid of user `kolab'", KOLAB_ERROR);
+    # Get the UID/GID of the 'kolab' users
+    $config{'kolab_uid'} = (getpwnam('@kolab_musr@'))[2];
+    if (!defined $config{'kolab_uid'}) {
+        &log('C', "Unable to determine the uid of user '@kolab_musr@'", KOLAB_ERROR);
 	$error = 1;
     }
-    if (!($config{'kolab_gid'} = (getgrnam('kolab'))[2])) {
-        &log('C', "Unable to determine the gid of user `kolab'", KOLAB_ERROR);
+
+    $config{'kolab_gid'} = (getgrnam('@kolab_mgrp@'))[2];
+    if (!defined $config{'kolab_gid'}) {
+        &log('C', "Unable to determine the gid of user '@kolab_mgrp@'", KOLAB_ERROR);
 	$error = 1;
     }
-    if (!($config{'kolab_n_uid'} = (getpwnam('kolab-n'))[2])) {
-        &log('C', "Unable to determine the uid of user `kolab-n'", KOLAB_ERROR);
+
+    $config{'kolab_n_uid'} = (getpwnam('@kolab_usr@'))[2];
+    if (!defined $config{'kolab_n_uid'}) {
+        &log('C', "Unable to determine the uid of user '@kolab_usr@'", KOLAB_ERROR);
 	$error = 1;
     }
-    if (!($config{'kolab_n_gid'} = (getgrnam('kolab-n'))[2])) {
-        &log('C', "Unable to determine the gid of user `kolab-n'", KOLAB_ERROR);
+
+    $config{'kolab_n_gid'} = (getgrnam('@kolab_grp@'))[2];
+    if (!defined $config{'kolab_n_gid'}) {
+        &log('C', "Unable to determine the gid of user @kolab_grp@'", KOLAB_ERROR);
 	$error = 1;
     }
-    if (!($config{'kolab_r_uid'} = (getpwnam('kolab-r'))[2])) {
-        &log('C', "Unable to determine the uid of user `kolab-r'", KOLAB_ERROR);
+
+    $config{'kolab_r_uid'} = (getpwnam('@kolab_rusr@'))[2];
+    if (!defined $config{'kolab_r_uid'}) {
+        &log('C', "Unable to determine the uid of user '@kolab_rusr@'", KOLAB_ERROR);
 	$error = 1;
     }
-    if (!($config{'kolab_r_gid'} = (getgrnam('kolab-r'))[2])) {
-        &log('C', "Unable to determine the gid of user `kolab-r'", KOLAB_ERROR);
+
+    $config{'kolab_r_gid'} = (getgrnam('@kolab_rgrp@'))[2];
+    if (!defined $config{'kolab_r_gid'}) {
+        &log('C', "Unable to determine the gid of user '@kolab_rgrp@'", KOLAB_ERROR);
 	$error = 1;
     }
 



From cvs at intevation.de  Sat Jan 14 23:16:07 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat, 14 Jan 2006 23:16:07 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin kolab-webadmin.spec.in,
	1.14, 1.15 ChangeLog, 1.14, 1.15 configure.ac, 1.21, 1.22 
Message-ID: <20060114221607.920711005C7@lists.intevation.de>

Author: richard

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

Modified Files:
	kolab-webadmin.spec.in ChangeLog configure.ac 
Log Message:
* configure.ac: replaced --enable-dist with --with-dist
  Added dist_conf file check.  If dist_conf file specified with
  --with-dist is not present fail configure.
* kolab-webadmin.spec.in: replaced --enable-dist with --with-dist



Index: kolab-webadmin.spec.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/kolab-webadmin.spec.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- kolab-webadmin.spec.in	11 Jan 2006 06:32:06 -0000	1.14
+++ kolab-webadmin.spec.in	14 Jan 2006 22:16:05 -0000	1.15
@@ -59,7 +59,7 @@
 	www/admin/kolab/versions.php
 
 %build
-    ./configure -prefix=%{l_prefix}
+    ./configure -prefix=%{l_prefix} --with-dist=kolab
 
 %install
     rm -rf $RPM_BUILD_ROOT

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ChangeLog	3 Jan 2006 22:04:37 -0000	1.14
+++ ChangeLog	14 Jan 2006 22:16:05 -0000	1.15
@@ -1,4 +1,12 @@
+2006-01-14 Marcus Hüwe <suse-tux at gmx.de>
+	Patch commited by Richard Bos
+	* configure.ac: replaced --enable-dist with --with-dist
+	  Added dist_conf file check.  If dist_conf file specified with
+	  --with-dist is not present fail configure.
+	* kolab-webadmin.spec.in: replaced --enable-dist with --with-dist
+
 2006-01-03 Richard Bos <richard at radoeka.nl>
+
 	* Makefile.am: distribute only the files to be distributed
 	  from the dist_conf directory
 	  Added a distclean-local rule to remove the directory autom4te.cache

Index: configure.ac
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/configure.ac,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- configure.ac	19 Dec 2005 21:57:43 -0000	1.21
+++ configure.ac	14 Jan 2006 22:16:05 -0000	1.22
@@ -8,11 +8,15 @@
 AM_INIT_AUTOMAKE([gnu] [1.7] [dist-bzip2] [no-dist-gzip])
 AC_PREFIX_DEFAULT([/usr])
 
-AC_ARG_ENABLE([dist],
-  [AC_HELP_STRING([--enable-dist=DIST],
+AC_ARG_WITH([dist],
+  [AC_HELP_STRING([--with-dist=DIST],
     [distribution target (default: openpkg)])],
-  [distribution=$srcdir/dist_conf/$enable_dist],
+  [distribution=$srcdir/dist_conf/$withval],
   [distribution=$srcdir/dist_conf/kolab])
+
+AS_IF([test -f $distribution],,
+	AC_MSG_ERROR([incorrect value for --with-dist: $withval])
+)
 AC_SUBST_FILE(distribution)
 
 common=dist_conf/common



From cvs at intevation.de  Sat Jan 14 23:16:22 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat, 14 Jan 2006 23:16:22 +0100 (CET)
Subject: richard: server/kolabd/kolabd kolabd.spec.in, 1.3, 1.4 ChangeLog, 1.41,
	1.42 configure.ac, 1.7, 1.8 
Message-ID: <20060114221622.2BD391005CA@lists.intevation.de>

Author: richard

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

Modified Files:
	kolabd.spec.in ChangeLog configure.ac 
Log Message:
* configure.ac: replaced --enable-dist with --with-dist
  Added dist_conf file check.  If dist_conf file specified with
  --with-dist is not present fail configure.
* kolabd.spec.in: replaced --enable-dist with --with-dist



Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolabd.spec.in	21 Dec 2005 14:31:01 -0000	1.3
+++ kolabd.spec.in	14 Jan 2006 22:16:20 -0000	1.4
@@ -89,7 +89,7 @@
     %setup -q
 
 %build
-    ./configure --prefix=%{l_prefix} --enable-dist=kolab
+    ./configure --prefix=%{l_prefix} --with-dist=kolab
     %{l_make} %{l_mflags}
 
 %install

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- ChangeLog	9 Jan 2006 22:09:08 -0000	1.41
+++ ChangeLog	14 Jan 2006 22:16:20 -0000	1.42
@@ -1,3 +1,10 @@
+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
+	  --with-dist is not present fail configure.
+	* kolabd.spec.in: replaced --enable-dist with --with-dist
+
 2006-01-09 Richard Bos <richard at radoeka.nl>
 	* Makefile.am: install templates/rc.conf.template only on openpkg
 	  installations.

Index: configure.ac
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/configure.ac,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- configure.ac	4 Jan 2006 22:03:59 -0000	1.7
+++ configure.ac	14 Jan 2006 22:16:20 -0000	1.8
@@ -11,11 +11,15 @@
 common=dist_conf/common
 AC_SUBST_FILE(common)
 
-AC_ARG_ENABLE([dist],
-  [AC_HELP_STRING([--enable-dist=DIST],
+AC_ARG_WITH([dist],
+  [AC_HELP_STRING([--with-dist=DIST],
      [distribution target (default: openpkg)])],
-     [distribution=$srcdir/dist_conf/$enable_dist],
+     [distribution=$srcdir/dist_conf/$withval],
    [distribution=$srcdir/dist_conf/kolab])
+
+AS_IF([test -f $distribution],,
+	AC_MSG_ERROR([incorrect value for --with-dist: $withval])
+)
 AC_SUBST_FILE(distribution)
 
 AC_ARG_WITH([openpkg],



From cvs at intevation.de  Sat Jan 14 23:16:45 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat, 14 Jan 2006 23:16:45 +0100 (CET)
Subject: richard: server/perl-kolab perl-kolab.spec.in, 1.29, 1.30 ChangeLog,
	1.11, 1.12 configure.ac, 1.2, 1.3 
Message-ID: <20060114221645.C7EF81005C7@lists.intevation.de>

Author: richard

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

Modified Files:
	perl-kolab.spec.in ChangeLog configure.ac 
Log Message:
* configure.ac: replaced --enable-dist with --with-dist
  Added dist_conf file check.  If dist_conf file specified with
  --with-dist is not present fail configure.
* perl-kolab.spec.in: replaced --enable-dist with --with-dist



Index: perl-kolab.spec.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- perl-kolab.spec.in	20 Dec 2005 14:34:51 -0000	1.29
+++ perl-kolab.spec.in	14 Jan 2006 22:16:43 -0000	1.30
@@ -65,7 +65,7 @@
 #    %{configure} --prefix=%{l_prefix} \
 #		 --includedir=%(eval "`%{l_prefix}/bin/perl -V:installsitearch`"; echo $installsitearch) \
 #		 --dist=kolab
-     %{configure} --prefix=%{l_prefix} --enable-dist=kolab
+     %{configure} --prefix=%{l_prefix} --with-dist=kolab
     make
 
 %install

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ChangeLog	14 Jan 2006 21:21:15 -0000	1.11
+++ ChangeLog	14 Jan 2006 22:16:43 -0000	1.12
@@ -1,3 +1,10 @@
+2006-01-14 Marcus Hüwe <suse-tux at gmx.de>
+	Patch commited by Richard Bos
+	* configure.ac: replaced --enable-dist with --with-dist
+	  Added dist_conf file check.  If dist_conf file specified with
+	  --with-dist is not present fail configure.
+	* perl-kolab.spec.in: replaced --enable-dist with --with-dist
+
 2006-01-14 Richard Bos <richard at radoeka.nl>
 	* Kolab/Kolab.pm.in: check for valid uid/gid values with perl define
 	  instead of the value.  The current check failed for root, as that

Index: configure.ac
===================================================================
RCS file: /kolabrepository/server/perl-kolab/configure.ac,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- configure.ac	19 Dec 2005 21:58:48 -0000	1.2
+++ configure.ac	14 Jan 2006 22:16:43 -0000	1.3
@@ -10,11 +10,15 @@
 common=dist_conf/common
 AC_SUBST_FILE(common)
 
-AC_ARG_ENABLE([dist],
-  [AC_HELP_STRING([--enable-dist=DIST],
+AC_ARG_WITH([dist],
+  [AC_HELP_STRING([--with-dist=DIST],
      [distribution target (default: openpkg)])],
-     [distribution=$srcdir/dist_conf/$enable_dist],
+     [distribution=$srcdir/dist_conf/$withval],
    [distribution=$srcdir/dist_conf/kolab])
+
+AS_IF([test -f $distribution],,
+	AC_MSG_ERROR([incorrect value for --with-dist: $withval])
+)
 AC_SUBST_FILE(distribution)
 
 # Checks for libraries.



From cvs at intevation.de  Sat Jan 14 23:16:58 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat, 14 Jan 2006 23:16:58 +0100 (CET)
Subject: richard: server/kolab-resource-handlers/kolab-resource-handlers
	kolab-resource-handlers.spec.in, 1.3, 1.4 ChangeLog, 1.9,
	1.10 configure.ac, 1.3, 1.4 
Message-ID: <20060114221658.8BCA71005C7@lists.intevation.de>

Author: richard

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

Modified Files:
	kolab-resource-handlers.spec.in ChangeLog configure.ac 
Log Message:
* configure.ac: replaced --enable-dist with --with-dist
  Added dist_conf file check.  If dist_conf file specified with
  --with-dist is not present fail configure.
* kolab-resource-handlers.spec.in: replaced --enable-dist with --with-dist



Index: kolab-resource-handlers.spec.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/kolab-resource-handlers.spec.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolab-resource-handlers.spec.in	20 Dec 2005 17:57:13 -0000	1.3
+++ kolab-resource-handlers.spec.in	14 Jan 2006 22:16:56 -0000	1.4
@@ -32,7 +32,7 @@
 %setup -q
 
 %build
-%configure --prefix=/kolab
+%configure --prefix=/kolab --with-dist=kolab
 
 %install
 %__make DESTDIR=%{buildroot} install

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ChangeLog	3 Jan 2006 22:06:57 -0000	1.9
+++ ChangeLog	14 Jan 2006 22:16:56 -0000	1.10
@@ -1,3 +1,11 @@
+2006-01-14 Marcus Hüwe <suse-tux at gmx.de>
+	Patch commited by Richard Bos
+	* configure.ac: replaced --enable-dist with --with-dist
+	  Added dist_conf file check.  If dist_conf file specified with
+	  --with-dist is not present fail configure.
+	* kolab-resource-handlers.spec.in: replaced --enable-dist
+	  with --with-dist
+
 2006-01-03 Richard Bos <richard at radoeka.nl>
 	* Makefile.am: distribute only the files to be distributed
 	  from the dist_conf directory

Index: configure.ac
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/configure.ac,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- configure.ac	19 Dec 2005 21:58:18 -0000	1.3
+++ configure.ac	14 Jan 2006 22:16:56 -0000	1.4
@@ -10,11 +10,15 @@
 common=dist_conf/common
 AC_SUBST_FILE(common)
 
-AC_ARG_ENABLE([dist],
-  [AC_HELP_STRING([--enable-dist=DIST],
+AC_ARG_WITH([dist],
+  [AC_HELP_STRING([--with-dist=DIST],
      [distribution target (default: openpkg)])],
-     [distribution=$srcdir/dist_conf/$enable_dist],
+     [distribution=$srcdir/dist_conf/$withval],
    [distribution=$srcdir/dist_conf/kolab])
+
+AS_IF([test -f $distribution],,
+	AC_MSG_ERROR([incorrect value for --with-dist: $withval])
+)
 AC_SUBST_FILE(distribution)
 
 # Checks for libraries.



From cvs at intevation.de  Sat Jan 14 23:45:56 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat, 14 Jan 2006 23:45:56 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog, 1.42,
	1.43 kolab_sslcert.sh.in, 1.1, 1.2 
Message-ID: <20060114224556.945B91005C7@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog kolab_sslcert.sh.in 
Log Message:
* dist_conf/kolab: removed restricted_kolab_usr and restricted_kolab_grp
  use the real value 'kolab-r' instead
* kolab_sslcert.sh.in: replace restricted_kolab_grp with kolab_rgrp



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- ChangeLog	14 Jan 2006 22:16:20 -0000	1.42
+++ ChangeLog	14 Jan 2006 22:45:54 -0000	1.43
@@ -1,3 +1,8 @@
+2006-01-14 Richard Bos <richard at radoeka.nl>
+	* dist_conf/kolab: removed restricted_kolab_usr and restricted_kolab_grp
+	  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>
 	Patch committed by Richard Bos
 	* configure.ac: replaced --enable-dist with --with-dist

Index: kolab_sslcert.sh.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_sslcert.sh.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab_sslcert.sh.in	13 Sep 2005 14:38:22 -0000	1.1
+++ kolab_sslcert.sh.in	14 Jan 2006 22:45:54 -0000	1.2
@@ -35,9 +35,9 @@
 		                   -config tmp.req.cnf >/dev/null 2>&1
 echo "done"
 
-chgrp @restricted_kolab_grp@ key.pem
+chgrp @kolab_rgrp@ key.pem
 chmod 0640 key.pem
-chgrp @restricted_kolab_grp@ cert.pem
+chgrp @kolab_rgrp@ cert.pem
 chmod 0640 cert.pem
 
 #rm -f tmp.req.cnf



From cvs at intevation.de  Sat Jan 14 23:45:56 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat, 14 Jan 2006 23:45:56 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf kolab,1.16,1.17 
Message-ID: <20060114224556.9639E1005CA@lists.intevation.de>

Author: richard

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

Modified Files:
	kolab 
Log Message:
* dist_conf/kolab: removed restricted_kolab_usr and restricted_kolab_grp
  use the real value 'kolab-r' instead
* kolab_sslcert.sh.in: replace restricted_kolab_grp with kolab_rgrp



Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- kolab	6 Jan 2006 20:37:43 -0000	1.16
+++ kolab	14 Jan 2006 22:45:54 -0000	1.17
@@ -11,11 +11,9 @@
 # @l_ngid@
 kolab_gid=1002
 # @l_rusr@
-restricted_kolab_usr=kolab-r
+kolab_rusr=kolab-r
 # @l_rgrp@
-restricted_kolab_grp=kolab-r
-kolab_rusr=${restricted_kolab_usr}
-kolab_rgrp=${restricted_kolab_grp}
+kolab_rgrp=kolab-r
 # @l_susr@
 kolab_susr=root
 
@@ -54,17 +52,17 @@
 freshclam_logfile=${localstatedir}/clamav/freshclam.log
 freshclam_pidfile=${sysrundir}/freshclam.pid
 # @l_rusr@
-clamav_rusr=${restricted_kolab_usr}
+clamav_rusr=kolab-r
 # @l_musr@
 clamav_usr=kolab
 # @l_rgrp@
-clamav_grp=${restricted_kolab_usr}
+clamav_grp=kolab-r
 
 # @l_musr@
 # @l_rgrp@
 
-emailscan_usr=${restricted_kolab_usr}
-emailscan_grp=${restricted_kolab_grp}
+emailscan_usr=kolab-r
+emailscan_grp=kolab-r
 
 emailserver_confdir=${sysconfdir}/postfix
 emailserver_socket=${localstatedir}/kolab/lmtp
@@ -73,7 +71,7 @@
 emailserver_sasl_conffile=${sysconfdir}/sasl/apps/smtpd.conf
 emailserver_usr=${kolab_usr}
 emailserver_musr=kolab
-emailserver_grp=${restricted_kolab_grp}
+emailserver_grp=kolab-r
 # @l_musr@
 emailserver_mail_usr=kolab
 



From cvs at intevation.de  Sun Jan 15 11:46:37 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 15 Jan 2006 11:46:37 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog, 1.43, 1.44 kolab_bootstrap.in,
	1.16, 1.17 
Message-ID: <20060115104637.0EA621005D0@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog kolab_bootstrap.in 
Log Message:
use more fine grained variables for sasl configuration files.  Changed
emailserver_sasl_confdir to sasl_smtpdconffile and sasl_confdir to
sasl_authdconffile.  This is needed for non openpkg based distributions.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- ChangeLog	14 Jan 2006 22:45:54 -0000	1.43
+++ ChangeLog	15 Jan 2006 10:46:34 -0000	1.44
@@ -1,3 +1,13 @@
+2006-01-15 Richard Bos <richard at radoeka.nl>
+	* dist_conf/common,
+	  dist_conf/debian,
+	  dist_conf/kolab,
+	  dist_conf/suse,
+	  templates/saslauthd.conf.template.in,
+	  templates/smtpd.conf.template.in: use more fine grained variables
+	  for sasl configuration files.  Changed emailserver_sasl_confdir to
+	  sasl_smtpdconffile and sasl_confdir to sasl_authdconffile.
+
 2006-01-14 Richard Bos <richard at radoeka.nl>
 	* dist_conf/kolab: removed restricted_kolab_usr and restricted_kolab_grp
 	  use the real value 'kolab-r' instead

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- kolab_bootstrap.in	6 Jan 2006 20:37:43 -0000	1.16
+++ kolab_bootstrap.in	15 Jan 2006 10:46:34 -0000	1.17
@@ -395,7 +395,7 @@
     }
   };
 
-  my $confname = "@emailserver_sasl_conffile@";
+  my $confname = "@sasl_smtpconffile@";
   copy("@sysconfdir@/kolab/templates/smtpd.conf.template", $confname) || die "could not write to $confname";
 
   getopts('b');
@@ -747,7 +747,7 @@
   $bind_pw = getUserInput("Manager password");
   $bind_pw_hash = hashPassword($bind_pw);
 
-  my $confname = "@emailserver_sasl_conffile@";
+  my $confname = "@sasl_smtpconffile@";
   copy("@sysconfdir@/kolab/templates/smtpd.conf.template", $confname) || die "could not write to $confname";
 
   print "Checking server info...\n";



From cvs at intevation.de  Sun Jan 15 11:46:37 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 15 Jan 2006 11:46:37 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf common, 1.13, 1.14 debian, 1.1,
	1.2 kolab, 1.17, 1.18 suse, 1.18, 1.19 
Message-ID: <20060115104637.1BD481005D4@lists.intevation.de>

Author: richard

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

Modified Files:
	common debian kolab suse 
Log Message:
use more fine grained variables for sasl configuration files.  Changed
emailserver_sasl_confdir to sasl_smtpdconffile and sasl_confdir to
sasl_authdconffile.  This is needed for non openpkg based distributions.



Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- common	6 Jan 2006 20:37:43 -0000	1.13
+++ common	15 Jan 2006 10:46:35 -0000	1.14
@@ -41,7 +41,6 @@
 	-e 's,[@]emailserver_localstatedir[@],$(emailserver_localstatedir),g' \
 	-e 's,[@]emailserver_logfile[@],$(emailserver_logfile),g' \
 	-e 's,[@]emailserver_musr[@],$(emailserver_musr),g' \
-	-e 's,[@]emailserver_sasl_conffile[@],$(emailserver_sasl_conffile),g' \
 	-e 's,[@]emailserver_socket[@],$(emailserver_socket),g' \
 	-e 's,[@]emailserver_usr[@],$(emailserver_usr),g' \
 	-e 's,[@]fbview_logfile[@],$(fbview_logfile),g' \
@@ -100,8 +99,9 @@
 	-e 's,[@]resmgr_logfile[@],$(resmgr_logfile),g' \
 	-e 's,[@]resmgr_usr[@],$(resmgr_usr),g' \
 	-e 's,[@]resmgr_filterdir[@],$(resmgr_filterdir),g' \
-	-e 's,[@]sasl_confdir[@],$(sasl_confdir),g' \
+	-e 's,[@]sasl_authdconffile[@],$(sasl_authdconffile),g' \
 	-e 's,[@]sasl_logfile[@],$(sasl_logfile),g' \
+	-e 's,[@]sasl_smtpconffile[@],$(sasl_smtpconffile),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.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- debian	1 Jan 2006 21:20:24 -0000	1.1
+++ debian	15 Jan 2006 10:46:35 -0000	1.2
@@ -51,7 +51,6 @@
 emailserver_socket=${libdir}/postfix/lmtp
 emailserver_localstatedir=${localstatedir}/spool/postfix
 emailserver_logfile=${localstatedir}/log/mail.log
-emailserver_sasl_conffile=${libdir}/sasl2/smtpd.conf
 emailserver_usr=${kolab_usr}
 emailserver_musr=kolab
 emailserver_grp=${restricted_kolab_grp}
@@ -119,7 +118,8 @@
 phplibdir2=${datadir}/php
 phppeardir=${phplibdir}/PEAR
 
-sasl_confdir=${sysconfdir}/sasl
+sasl_authdconffile=${sysconfdir}/sasl/____
+sasl_smtpconffile=${libdir}/sasl2/smtpd.conf
 sasl_logfile=${localstatedir}/log/saslauthd.log
 
 resmgr_logfile=${localstatedir}/log/resmgr.log

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- kolab	14 Jan 2006 22:45:54 -0000	1.17
+++ kolab	15 Jan 2006 10:46:35 -0000	1.18
@@ -68,7 +68,6 @@
 emailserver_socket=${localstatedir}/kolab/lmtp
 emailserver_localstatedir=${localstatedir}/postfix
 emailserver_logfile=${emailserver_localstatedir}/log/postfix.log
-emailserver_sasl_conffile=${sysconfdir}/sasl/apps/smtpd.conf
 emailserver_usr=${kolab_usr}
 emailserver_musr=kolab
 emailserver_grp=kolab-r
@@ -143,7 +142,8 @@
 phplibdir2=${kolab_statedir}/php
 phppeardir=${phplibdir2}/pear
 
-sasl_confdir=${sysconfdir}/sasl
+sasl_authdconffile=${sysconfdir}/sasl/saslauthd.conf
+sasl_smtpconffile=${sysconfdir}/sasl/apps/smtpd.conf
 sasl_logfile=${localstatedir}/sasl/log/saslauthd.log
 
 sysrundir=${localstatedir}/run

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- suse	9 Jan 2006 21:44:31 -0000	1.18
+++ suse	15 Jan 2006 10:46:35 -0000	1.19
@@ -52,7 +52,6 @@
 emailserver_socket=${libdir}/postfix/lmtp
 emailserver_localstatedir=${localstatedir}/spool/postfix
 emailserver_logfile=${localstatedir}/log/postfix.log
-emailserver_sasl_conffile=${libdir}/sasl2/smtpd.conf
 emailserver_usr=postfix
 emailserver_musr=maildrop
 emailserver_grp=root
@@ -120,7 +119,8 @@
 phplibdir2=${datadir}/php
 phppeardir=${phplibdir}/PEAR
 
-sasl_confdir=${sysconfdir}/sasl
+sasl_smtpconffile=${libdir}/sasl2/smtpd.conf
+sasl_authdconffile=${sysconfdir}/sasl/___
 sasl_logfile=${localstatedir}/log/saslauthd.log
 
 resmgr_logfile=${localstatedir}/log/resmgr.log



From cvs at intevation.de  Sun Jan 15 11:46:37 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 15 Jan 2006 11:46:37 +0100 (CET)
Subject: richard: server/kolabd/kolabd/templates saslauthd.conf.template.in,
	1.1, 1.2 smtpd.conf.template.in, 1.1, 1.2 
Message-ID: <20060115104637.1EBCC1005DB@lists.intevation.de>

Author: richard

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

Modified Files:
	saslauthd.conf.template.in smtpd.conf.template.in 
Log Message:
use more fine grained variables for sasl configuration files.  Changed
emailserver_sasl_confdir to sasl_smtpdconffile and sasl_confdir to
sasl_authdconffile.  This is needed for non openpkg based distributions.



Index: saslauthd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/saslauthd.conf.template.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- saslauthd.conf.template.in	13 Sep 2005 14:38:22 -0000	1.1
+++ saslauthd.conf.template.in	15 Jan 2006 10:46:35 -0000	1.2
@@ -1,5 +1,5 @@
 KOLAB_META_START
-TARGET=@sasl_confdir@/saslauthd.conf
+TARGET=@sasl_authdconffile@
 PERMISSIONS=0600
 OWNERSHIP=@kolab_musr@:@kolab_mgrp@
 KOLAB_META_END

Index: smtpd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/smtpd.conf.template.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- smtpd.conf.template.in	13 Sep 2005 14:38:22 -0000	1.1
+++ smtpd.conf.template.in	15 Jan 2006 10:46:35 -0000	1.2
@@ -1,5 +1,5 @@
 KOLAB_META_START
-TARGET=@sasl_confdir@/apps/smtpd.conf
+TARGET=@sasl_smtpconffile@
 PERMISSIONS=0644
 OWNERSHIP=root:root
 KOLAB_META_END



From cvs at intevation.de  Sun Jan 15 14:59:07 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 15 Jan 2006 14:59:07 +0100 (CET)
Subject: richard: server/perl-kolab/Kolab-Conf Conf.pm.in,1.3,1.4 
Message-ID: <20060115135907.AE4F8101EE6@lists.intevation.de>

Author: richard

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

Modified Files:
	Conf.pm.in 
Log Message:
use the new variable sasl_authdconffile instead of @sasl_confdir@/saslauthd.conf



Index: Conf.pm.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Conf.pm.in	7 Jan 2006 21:10:20 -0000	1.3
+++ Conf.pm.in	15 Jan 2006 13:59:05 -0000	1.4
@@ -89,7 +89,7 @@
 # 		 "$templatedir/master.cf.template" => "@emailserver_confdir@/master.cf",
 # 		 "$templatedir/transport.template" => "@emailserver_confdir@/transport",
 # 		 "$templatedir/virtual.template" => "@emailserver_confdir@/virtual",
-# 		 "$templatedir/saslauthd.conf.template" => "@sasl_confdir@/saslauthd.conf",
+# 		 "$templatedir/saslauthd.conf.template" => "@sasl_authdconffile@",
 # 		 "$templatedir/imapd.conf.template" => "@imap_confdir@/imapd.conf",
 # 		 "$templatedir/imapd.group.template" => "@imap_confdir@/imapd.group",
 # 		 "$templatedir/cyrus.conf.template" => "@imap_confdir@/cyrus.conf",
@@ -121,7 +121,7 @@
 # 		   "@clamav_confdir@/clamd.conf"                           => 0640,
 # 		   "@clamav_confdir@/freshclam.conf"                       => 0640,
 # 		   "@sysconfdir@/amavisd/amavisd.conf"                     => 0640,
-# 		   "@sasl_confdir@/saslauthd.conf"                         => 0600,
+# 		   "@sasl_authdconffile@"                         => 0600,
 # 		   "@imap_confdir@/imapd.conf"                             => oct('@imap_confperm@'),
 # 		   "@webserver_confdir@/apache.conf"                       => 0640,
 # 		   "@webserver_confdir@/apache.local"                      => 0640,
@@ -150,8 +150,8 @@
 # 		 "@emailserver_confdir@/master.cf"                        => "@emailserver_usr@:@emailserver_grp@",
 # 		 "@clamav_confdir@/clamd.conf"                           => "kolab:kolab-r",
 # 		 "@clamav_confdir@/freshclam.conf"                       => "kolab:kolab-r",
-# 		 "@amavisd_confdir@/amavisd.conf"                     => "kolab:kolab-r",
-# 		 "@sasl_confdir@/saslauthd.conf"                         => "kolab:kolab",
+# 		 "@amavisd_confdir@/amavisd.conf"                        => "kolab:kolab-r",
+# 		 "@sasl_authdconffile@"                                  => "kolab:kolab",
 # 		 "@imap_confdir@/imapd.conf"                             => "@imap_usr@:@imap_grp@",
 # 		 "@webserver_confdir@/apache.conf"                       => "kolab:kolab-n",
 # 		 "@webserver_confdir@/apache.local"                      => "kolab:kolab-n",



From cvs at intevation.de  Sun Jan 15 14:59:07 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 15 Jan 2006 14:59:07 +0100 (CET)
Subject: richard: server/perl-kolab ChangeLog,1.12,1.13 
Message-ID: <20060115135907.AB398101EE5@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
use the new variable sasl_authdconffile instead of @sasl_confdir@/saslauthd.conf



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ChangeLog	14 Jan 2006 22:16:43 -0000	1.12
+++ ChangeLog	15 Jan 2006 13:59:05 -0000	1.13
@@ -1,3 +1,7 @@
+2006-01-15 Richard Bos <richard at radoeka.nl>
+	* Kolab-Conf/Conf.pm.in: use the new variable sasl_authdconffile
+	  instead of @sasl_confdir@/saslauthd.conf
+
 2006-01-14 Marcus Hüwe <suse-tux at gmx.de>
 	Patch commited by Richard Bos
 	* configure.ac: replaced --enable-dist with --with-dist



From cvs at intevation.de  Sun Jan 15 20:24:25 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 15 Jan 2006 20:24:25 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
	messages.po, 1.8, 1.9 
Message-ID: <20060115192425.C6E40101EE6@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
cosmetic update

Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES/messages.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- messages.po	14 Dec 2005 19:46:15 -0000	1.8
+++ messages.po	15 Jan 2006 19:24:23 -0000	1.9
@@ -2110,7 +2110,7 @@
 
 #: ../include/auth.class.php:45
 msgid "Could not bind to LDAP server: "
-msgstr "Kon geen verbinding maken met LDAP server"
+msgstr "Kon geen verbinding maken met LDAP server: "
 
 #: ../include/auth.class.php:56
 msgid "Could not bind to LDAP server"



From cvs at intevation.de  Sun Jan 15 21:32:49 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 15 Jan 2006 21:32:49 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog, 1.44, 1.45 Makefile.am, 1.16,
	1.17 
Message-ID: <20060115203249.85655101EE9@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
split the variable amavisd_confdir into amavisd_conffile and
amavisd_templatedir to give non openpkg based distro more control over
the exact amavisd_templatedir location.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- ChangeLog	15 Jan 2006 10:46:34 -0000	1.44
+++ ChangeLog	15 Jan 2006 20:32:47 -0000	1.45
@@ -1,4 +1,13 @@
 2006-01-15 Richard Bos <richard at radoeka.nl>
+	* Makefile.am,
+	  dist_conf/common,
+	  dist_conf/debian,
+	  dist_conf/kolab,
+	  dist_conf/suse,
+	  templates/amavisd.conf.template.in: split the variable amavisd_confdir
+	  into amavisd_conffile and amavisd_templatedir.
+
+2006-01-15 Richard Bos <richard at radoeka.nl>
 	* dist_conf/common,
 	  dist_conf/debian,
 	  dist_conf/kolab,

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile.am	9 Jan 2006 22:09:08 -0000	1.16
+++ Makefile.am	15 Jan 2006 20:32:47 -0000	1.17
@@ -109,7 +109,7 @@
 	amavisd/en_US/template-virus-recipient.txt \
 	amavisd/en_US/template-virus-sender.txt
 
-amavisdusdir = $(amavisd_confdir)/templates/en_US
+amavisdusdir = $(amavisd_templatedir)/en_US
 dist_amavisdus_DATA = $(amavisdus_FILES)
 
 
@@ -121,7 +121,7 @@
 	amavisd/de/template-virus-recipient.txt \
 	amavisd/de/template-virus-sender.txt
 
-amavisddedir = $(amavisd_confdir)/templates/de
+amavisddedir = $(amavisd_templatedir)/de
 dist_amavisdde_DATA = $(amavisdde_FILES)
 
 kolabdoc_FILES = doc/README.amavisd \



From cvs at intevation.de  Sun Jan 15 21:32:49 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 15 Jan 2006 21:32:49 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf common, 1.14, 1.15 debian, 1.2,
	1.3 kolab, 1.18, 1.19 suse, 1.19, 1.20 
Message-ID: <20060115203249.9634F101EEA@lists.intevation.de>

Author: richard

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

Modified Files:
	common debian kolab suse 
Log Message:
split the variable amavisd_confdir into amavisd_conffile and
amavisd_templatedir to give non openpkg based distro more control over
the exact amavisd_templatedir location.



Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- common	15 Jan 2006 10:46:35 -0000	1.14
+++ common	15 Jan 2006 20:32:47 -0000	1.15
@@ -19,11 +19,12 @@
 	-e 's,[@]VERSION[@],$(VERSION),g' \
 	-e 's,[@]WITHOPENPKG[@],$(WITHOPENPKG),g' \
 	-e 's,[@]restricted_kolab_grp[@],$(restricted_kolab_grp),g' \
-	-e 's,[@]amavisd_confdir[@],$(amavisd_confdir),g' \
+	-e 's,[@]amavisd_conffile[@],$(amavisd_conffile),g' \
 	-e 's,[@]amavisd_grp[@],$(amavisd_grp),g' \
 	-e 's,[@]amavisd_home[@],$(amavisd_home),g' \
 	-e 's,[@]amavisd_logfile[@],$(amavisd_logfile),g' \
 	-e 's,[@]amavisd_rusr[@],$(amavisd_rusr),g' \
+	-e 's,[@]amavisd_templatedir[@],$(amavisd_templatedir),g' \
 	-e 's,[@]amavisd_usr[@],$(amavisd_usr),g' \
 	-e 's,[@]backupdir[@],$(backupdir),g' \
 	-e 's,[@]backupfiles[@],$(backupfiles),g' \

Index: debian
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/debian,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- debian	15 Jan 2006 10:46:35 -0000	1.2
+++ debian	15 Jan 2006 20:32:47 -0000	1.3
@@ -21,7 +21,8 @@
 # perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/"
 perllib=${libdir}/perl5
 
-amavisd_confdir=${sysconfdir}/amavis/conf.d
+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

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- kolab	15 Jan 2006 10:46:35 -0000	1.18
+++ kolab	15 Jan 2006 20:32:47 -0000	1.19
@@ -31,7 +31,8 @@
 # /kolab/bin/perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/"
 perllib=${libdir}/perl/vendor_perl/5.8.7
 
-amavisd_confdir=${sysconfdir}/amavisd
+amavisd_conffile=${sysconfdir}/amavisd/amavisd.conf
+amavisd_templatedir=${sysconfdir}/amavisd/templates
 amavisd_logfile=${localstatedir}/amavisd/amavis.log
 amavisd_home=${localstatedir}/amavisd
 # @l_rusr@

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- suse	15 Jan 2006 10:46:35 -0000	1.19
+++ suse	15 Jan 2006 20:32:47 -0000	1.20
@@ -22,7 +22,8 @@
 # perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/"
 perllib=${libdir}/perl5/vendor_perl/5.8.7
 
-amavisd_confdir=${sysconfdir}/kolab/amavisd
+amavisd_conffile=${sysconfdir}/amavisd.conf
+amavisd_templatedir=${sysconfdir}/amavisd/templates.d
 amavisd_logfile=${localstatedir}/log/amavisd
 amavisd_home=${localstatedir}/amavisd
 amavisd_rusr=vscan



From cvs at intevation.de  Sun Jan 15 21:32:49 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 15 Jan 2006 21:32:49 +0100 (CET)
Subject: richard: server/kolabd/kolabd/templates amavisd.conf.template.in, 1.4,
	1.5 
Message-ID: <20060115203249.9855C101EEC@lists.intevation.de>

Author: richard

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

Modified Files:
	amavisd.conf.template.in 
Log Message:
split the variable amavisd_confdir into amavisd_conffile and
amavisd_templatedir to give non openpkg based distro more control over
the exact amavisd_templatedir location.



Index: amavisd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/amavisd.conf.template.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- amavisd.conf.template.in	11 Jan 2006 14:49:05 -0000	1.4
+++ amavisd.conf.template.in	15 Jan 2006 20:32:47 -0000	1.5
@@ -1,5 +1,5 @@
 KOLAB_META_START
-TARGET=@amavisd_confdir@/amavisd.conf
+TARGET=@amavisd_conffile@
 PERMISSIONS=0640
 OWNERSHIP=@amavisd_usr@:@amavisd_grp@
 KOLAB_META_END
@@ -335,8 +335,8 @@
 # If notification template files are collectively available in some directory,
 # use read_l10n_templates which calls read_text for each known template.
 #
-read_l10n_templates('@amavisd_confdir@/templates/en_US');
-#read_l10n_templates('@amavisd_confdir@/templates/de');
+read_l10n_templates('@amavisd_templatedir@/en_US');
+#read_l10n_templates('@amavisd_templatedir@/de');
 
 
 # Here is an overall picture (sequence of events) of how pieces fit together



From cvs at intevation.de  Sun Jan 15 21:50:33 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 15 Jan 2006 21:50:33 +0100 (CET)
Subject: richard: server/kolabd/kolabd/doc README.webgui.in,1.2,1.3 
Message-ID: <20060115205033.76232101EE9@lists.intevation.de>

Author: richard

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

Modified Files:
	README.webgui.in 
Log Message:
Corrected a typo.

But what is written between >>> ........... <<<<
2) Controlling access for regular users to the LDAP attributes of the
user's account object. >>>>>  If it possible to change which LDAP attributes
are shown to users on the user page. <<<<<

please correct if you know!!





Index: README.webgui.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/doc/README.webgui.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- README.webgui.in	10 Dec 2005 21:57:11 -0000	1.2
+++ README.webgui.in	15 Jan 2006 20:50:31 -0000	1.3
@@ -26,7 +26,7 @@
 
 By default all classes can use the webgui. By changing
 @sysconfdir@/kolab/templates/session_vars.php this can be
-configured. The user-classes that shold have access to the webgui
+configured. The user-classes that should have access to the webgui
 are listed in the $params['allow_user_classes'] array:
 
 $params['allow_user_classes'] = 



From cvs at intevation.de  Sun Jan 15 21:56:30 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 15 Jan 2006 21:56:30 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf common, 1.15, 1.16 kolab, 1.19,
	1.20 suse, 1.20, 1.21 
Message-ID: <20060115205630.62EBC101EEA@lists.intevation.de>

Author: richard

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

Modified Files:
	common kolab suse 
Log Message:
Introduced RPM variable



Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- common	15 Jan 2006 20:32:47 -0000	1.15
+++ common	15 Jan 2006 20:56:28 -0000	1.16
@@ -16,6 +16,7 @@
 	-e 's,[@]LDAPD[@],$(LDAPD),g' \
 	-e 's,[@]PERL[@],$(PERL),g' \
 	-e 's,[@]PHP[@],$(PHP),g' \
+	-e 's,[@]RPM[@],$(RPM),g' \
 	-e 's,[@]VERSION[@],$(VERSION),g' \
 	-e 's,[@]WITHOPENPKG[@],$(WITHOPENPKG),g' \
 	-e 's,[@]restricted_kolab_grp[@],$(restricted_kolab_grp),g' \

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- kolab	15 Jan 2006 20:32:47 -0000	1.19
+++ kolab	15 Jan 2006 20:56:28 -0000	1.20
@@ -21,6 +21,7 @@
 PERL=${bindir}/perl
 PHP=${bindir}/php
 KOLABRC=${bindir}/openpkg
+RPM=${KOLABRC} rpm
 
 # Define the deamons that are executed with openpkg rc
 LDAPD=openldap

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- suse	15 Jan 2006 20:32:47 -0000	1.20
+++ suse	15 Jan 2006 20:56:28 -0000	1.21
@@ -12,6 +12,7 @@
 KOLABRC=${sbindir}/kolabsrv
 PERL=${bindir}/perl
 PHP=${bindir}/php
+RPM=/bin/rpm
 
 # Define the deamons that are launched from /etc/init.d
 LDAPD=ldap



From cvs at intevation.de  Sun Jan 15 21:56:30 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 15 Jan 2006 21:56:30 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog,1.45,1.46 
Message-ID: <20060115205630.5346B101EE9@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
Introduced RPM variable



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- ChangeLog	15 Jan 2006 20:32:47 -0000	1.45
+++ ChangeLog	15 Jan 2006 20:56:28 -0000	1.46
@@ -1,3 +1,9 @@
+2006-01-15 Marcus Hüwe <suse-tux at gmx.de>
+	Patch committed by Richard Bos
+	* dist_conf/common,
+	  dist_conf/kolab,
+	  dist_conf/suse: introduced RPM variable
+
 2006-01-15 Richard Bos <richard at radoeka.nl>
 	* Makefile.am,
 	  dist_conf/common,



From cvs at intevation.de  Sun Jan 15 22:05:56 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 15 Jan 2006 22:05:56 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.15,
	1.16 Makefile.am, 1.30, 1.31 
Message-ID: <20060115210556.BA04D101EE9@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Use the @RPM@ in www/admin/kolab/versions.php, to show the version
nnumber of the used packages.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ChangeLog	14 Jan 2006 22:16:05 -0000	1.15
+++ ChangeLog	15 Jan 2006 21:05:54 -0000	1.16
@@ -1,3 +1,9 @@
+2006-01-15 Marcus Hüwe <suse-tux at gmx.de>
+	Patch committed by Richard Bos
+	* www/admin/kolab/versions.php: moved to /www/admin/kolab/versions.php.in,
+	  replaced "$kolab_prefix/bin/openpkg" with @RPM@
+	* Makefile.am: make www/admin/kolab/versions.php.in
+
 2006-01-14 Marcus Hüwe <suse-tux at gmx.de>
 	Patch commited by Richard Bos
 	* configure.ac: replaced --enable-dist with --with-dist

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- Makefile.am	3 Jan 2006 22:04:37 -0000	1.30
+++ Makefile.am	15 Jan 2006 21:05:54 -0000	1.31
@@ -41,14 +41,15 @@
 
 WSABOUT_FILES = www/admin/kolab/erfrakon.php \
 	www/admin/kolab/index.php \
-	www/admin/kolab/versions.php \
 	www/admin/kolab/intevation.php \
 	www/admin/kolab/codefusion.php \
 	www/admin/kolab/kdab.php \
 	www/admin/kolab/kde.php
 
 wsaboutdir = $(wskolabdir)/kolab
-dist_wsabout_DATA = $(WSABOUT_FILES)
+wsabout_DATA = $(WSABOUT_FILES) \
+	www/admin/kolab/versions.php
+EXTRA_DIST += $(WSABOUT_FILES)
 
 WSMAINTAINER_FILES = www/admin/maintainer/maintainer.php \
 	www/admin/maintainer/index.php
@@ -229,6 +230,12 @@
 	$(do_subst) <$(srcdir)/www/admin/user/user.php.in >$@
 CLEANFILES += www/admin/user/user.php
 EXTRA_DIST += www/admin/user/user.php.in
+
+www/admin/kolab/versions.php:
+	@$(mkinstalldirs) www/admin/kolab
+	$(do_subst) <$(srcdir)/www/admin/kolab/versions.php.in >$@
+CLEANFILES += www/admin/kolab/versions.php
+EXTRA_DIST += www/admin/kolab/versions.php.in
 
 
 install-data-hook:



From cvs at intevation.de  Sun Jan 15 22:05:56 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 15 Jan 2006 22:05:56 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/www/admin/kolab
	versions.php, 1.3, NONE 
Message-ID: <20060115210556.BCB5C101EEA@lists.intevation.de>

Author: richard

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

Removed Files:
	versions.php 
Log Message:
Use the @RPM@ in www/admin/kolab/versions.php, to show the version
nnumber of the used packages.



--- versions.php DELETED ---



From cvs at intevation.de  Sun Jan 15 22:55:53 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 15 Jan 2006 22:55:53 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
	messages.po, 1.9, 1.10 
Message-ID: <20060115215553.237D7101EE9@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
add forgotten </a>

Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES/messages.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- messages.po	15 Jan 2006 19:24:23 -0000	1.9
+++ messages.po	15 Jan 2006 21:55:51 -0000	1.10
@@ -226,7 +226,7 @@
 "within the Kolab project are the principle design and architecure of the "
 "Kolab groupware solution and the creation of the Kolab 1 server."
 msgstr ""
-"<a href=\"http://www.erfrakon.com\">erfrakon< is een consultancy bedrijf "
+"<a href=\"http://www.erfrakon.com\">erfrakon</a> is een consultancy bedrijf "
 "gewijd aan opensource software en Linux. De hoofdopdrachten van Efrakon "
 "binnen het kolab project zijn het ontwerp en de architectuur van Kolab "
 "groupware oplossingen en de creatie van de Kolab 1 server."



From cvs at intevation.de  Sun Jan 15 22:57:53 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 15 Jan 2006 22:57:53 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
	messages.po, 1.10, 1.11 
Message-ID: <20060115215753.AC234101EE9@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
Don't refer to apps.kde.org it does not exist anymore, use
www.kde-apps.org instead



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES/messages.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- messages.po	15 Jan 2006 21:55:51 -0000	1.10
+++ messages.po	15 Jan 2006 21:57:51 -0000	1.11
@@ -64,7 +64,7 @@
 "Unix, which allows for the rapid and efficient creation of applications."
 msgstr ""
 "<b>KDE</b> is een geëvolueerde desktop suite die een solide basis biedt voor "
-"een groeiend aantal <a href=\"http://apps.kde.com\">toepassingen</a> voor "
+"een groeiend aantal <a href=\"http://www.kde-apps.org\">toepassingen</a> voor "
 "Unix werkstations.  KDE heeft voor Unix een ontwikkelingsomgeving van hoge "
 "kwaliteit ontwikkeld, die een snelle en efficiënte ontwikkeling van "
 "toepassingen toelaat."



From cvs at intevation.de  Sun Jan 15 23:01:08 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 15 Jan 2006 23:01:08 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/templates
	kde.tpl, 1.1, 1.2 
Message-ID: <20060115220108.B599E101EE9@lists.intevation.de>

Author: richard

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

Modified Files:
	kde.tpl 
Log Message:
Use www.kde-apps.org instead of the obsolete apps.kde.com



Index: kde.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/kde.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kde.tpl	11 Mar 2005 09:59:05 -0000	1.1
+++ kde.tpl	15 Jan 2006 22:01:06 -0000	1.2
@@ -8,6 +8,6 @@
 {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>
 <p>
-{tr msg="<b>KDE</b> is a mature desktop suite providing a solid basis to an ever growing number of <a href=\"http://apps.kde.com\">applications</a> for Unix workstations.  KDE has developed a high quality development framework for Unix, which allows for the rapid and efficient creation of applications."}
+{tr msg="<b>KDE</b> is a mature desktop suite providing a solid basis to an ever growing number of <a href=\"http://www.kde-apps.org\">applications</a> for Unix workstations.  KDE has developed a high quality development framework for Unix, which allows for the rapid and efficient creation of applications."}
 </p>
 </div>



From cvs at intevation.de  Sun Jan 15 23:09:38 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 15 Jan 2006 23:09:38 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
	messages.po, 1.11, 1.12 
Message-ID: <20060115220938.C4DD51005DB@lists.intevation.de>

Author: richard

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

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

Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES/messages.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- messages.po	15 Jan 2006 21:57:51 -0000	1.11
+++ messages.po	15 Jan 2006 22:09:36 -0000	1.12
@@ -116,8 +116,8 @@
 "ontwikkeling en de uitbreiding van de Kolab server; vooral met betrekking "
 "tot de verbetering van de basis Kolab engine, door de ondersteuning voor "
 "Microsoft Active Directory &reg toe te voegen; als een LDAP backend en door "
-"het Horde-project te verbeteren <a href=\"http://www.horde.org/\"> door een "
-"web-based groupware client voor de Kolab server te voorzien.."
+"het <a href=\"http://www.horde.org/\">Horde-project</a> te verbeteren door "
+"een web-based groupware client voor de Kolab server te voorzien.."
 
 #: tpl_messages.php:17
 msgid ""
@@ -1703,11 +1703,11 @@
 #: ../../../www/admin/maintainer/maintainer.php:286
 #: ../../../www/admin/maintainer/maintainer.php:297 ../include/menu.php:85
 msgid "Create New Maintainer"
-msgstr "Maintainers aanmaken"
+msgstr "Nieuwe beheerder aanmaken"
 
 #: ../../../www/admin/maintainer/maintainer.php:312
 msgid "Delete Maintainer"
-msgstr "Maintainers verwijderen"
+msgstr "Beheerder verwijderen"
 
 #: ../../../www/admin/maintainer/maintainer.php:330
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php:319
@@ -1724,7 +1724,7 @@
 
 #: ../../../www/admin/maintainer/maintainer.php:342
 msgid "Maintainer Deleted"
-msgstr "Maintainer verwijderd"
+msgstr "Beheerder verwijderd"
 
 #: ../../../www/admin/administrator/admin.php:98
 msgid "Manager's password can't be changed from the webgui"
@@ -1938,7 +1938,7 @@
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php:286
 #: ../include/menu.php:77
 msgid "Create New Domain Maintainer"
-msgstr "Nieuwe domein beheerders aanmaken"
+msgstr "Nieuwe domein beheerder aanmaken"
 
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php:301
 msgid "Delete Domain Maintainer"
@@ -2010,7 +2010,7 @@
 
 #: ../include/menu.php:73
 msgid "Domain Maintainers"
-msgstr "Domein maintainers"
+msgstr "Domein beheerders"
 
 #: ../include/menu.php:75
 msgid "Manage Domain Maintainers"
@@ -2018,7 +2018,7 @@
 
 #: ../include/menu.php:81 ../include/menu.php:89
 msgid "Maintainers"
-msgstr "Maintainers"
+msgstr "Beheerders"
 
 #: ../include/menu.php:83
 msgid "Manage Maintainers"



From cvs at intevation.de  Mon Jan 16 12:38:24 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon, 16 Jan 2006 12:38:24 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog, 1.46, 1.47 kolab_bootstrap.in,
	1.17, 1.18 
Message-ID: <20060116113824.859D11006B4@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog kolab_bootstrap.in 
Log Message:
Patch for  for non openpkg based distributions:
* kolab_bootstrap.in: use @ldapserver_usr@ instead of @kolab_musr@ to alter the
  ownership of the files $pubreskey $privreskey on the master server.
* templates/session_vars.php.template.in: use @webserver_musr@ instead of @kolab_musr@



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- ChangeLog	15 Jan 2006 20:56:28 -0000	1.46
+++ ChangeLog	16 Jan 2006 11:38:22 -0000	1.47
@@ -1,3 +1,9 @@
+2006-01-16 Richard Bos <richard at radoeka.nl>
+	Patch for  for non openpkg based distributions:
+	* kolab_bootstrap.in: use @ldapserver_usr@ instead of @kolab_musr@ to alter the
+	  ownership of the files $pubreskey $privreskey on the master server.
+	* templates/session_vars.php.template.in: use @webserver_musr@ instead of @kolab_musr@
+
 2006-01-15 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos
 	* dist_conf/common,

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- kolab_bootstrap.in	15 Jan 2006 10:46:34 -0000	1.17
+++ kolab_bootstrap.in	16 Jan 2006 11:38:22 -0000	1.18
@@ -668,7 +668,7 @@
     print "Creating RSA keypair for resource password encryption\n";
     kolab_system("@bindir@/openssl genrsa -out $privreskey 1024");
     kolab_system("@bindir@/openssl rsa -in $privreskey -pubout -out $pubreskey");
-    kolab_system("chown @kolab_musr@:@kolab_grp@ $pubreskey $privreskey");
+    kolab_system("chown @ldapserver_usr@:@kolab_grp@ $pubreskey $privreskey");
     chmod 0660, $privreskey, $pubreskey;
     #unlink( "dsa-params" );
     umask $oldmask;



From cvs at intevation.de  Mon Jan 16 12:38:24 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon, 16 Jan 2006 12:38:24 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf suse,1.21,1.22 
Message-ID: <20060116113824.8A6B41006B8@lists.intevation.de>

Author: richard

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

Modified Files:
	suse 
Log Message:
Patch for  for non openpkg based distributions:
* kolab_bootstrap.in: use @ldapserver_usr@ instead of @kolab_musr@ to alter the
  ownership of the files $pubreskey $privreskey on the master server.
* templates/session_vars.php.template.in: use @webserver_musr@ instead of @kolab_musr@



Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- suse	15 Jan 2006 20:56:28 -0000	1.21
+++ suse	16 Jan 2006 11:38:22 -0000	1.22
@@ -122,7 +122,7 @@
 phppeardir=${phplibdir}/PEAR
 
 sasl_smtpconffile=${libdir}/sasl2/smtpd.conf
-sasl_authdconffile=${sysconfdir}/sasl/___
+sasl_authdconffile=${libdir}/sasl2/authd.conf
 sasl_logfile=${localstatedir}/log/saslauthd.log
 
 resmgr_logfile=${localstatedir}/log/resmgr.log



From cvs at intevation.de  Mon Jan 16 12:38:24 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon, 16 Jan 2006 12:38:24 +0100 (CET)
Subject: richard: server/kolabd/kolabd/templates session_vars.php.template.in,
	1.2, 1.3 
Message-ID: <20060116113824.8BF4F1006BB@lists.intevation.de>

Author: richard

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

Modified Files:
	session_vars.php.template.in 
Log Message:
Patch for  for non openpkg based distributions:
* kolab_bootstrap.in: use @ldapserver_usr@ instead of @kolab_musr@ to alter the
  ownership of the files $pubreskey $privreskey on the master server.
* templates/session_vars.php.template.in: use @webserver_musr@ instead of @kolab_musr@



Index: session_vars.php.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/session_vars.php.template.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- session_vars.php.template.in	5 Dec 2005 16:21:34 -0000	1.2
+++ session_vars.php.template.in	16 Jan 2006 11:38:22 -0000	1.3
@@ -1,7 +1,7 @@
 KOLAB_META_START
 TARGET=@phplibdir2@/admin/include/session_vars.php
 PERMISSIONS=0640
-OWNERSHIP=@kolab_musr@:@kolab_grp@
+OWNERSHIP=@webserver_musr@:@kolab_grp@
 KOLAB_META_END
 <?php
 /*



From cvs at intevation.de  Mon Jan 16 19:36:17 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon, 16 Jan 2006 19:36:17 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/www/admin/kolab
	versions.php.in, NONE, 1.1 
Message-ID: <20060116183617.2A8731006B3@lists.intevation.de>

Author: richard

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

Added Files:
	versions.php.in 
Log Message:
Initial checkin



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



From cvs at intevation.de  Mon Jan 16 22:47:22 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon, 16 Jan 2006 22:47:22 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog, 1.47, 1.48 kolab_bootstrap.in,
	1.18, 1.19 
Message-ID: <20060116214722.973BE1005CB@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog kolab_bootstrap.in 
Log Message:
Use @kolab_rgrp@ iso @kolab_rusr@ in chgrp command.
Revert the previous update; "use @ldapserver_usr@ instead of @kolab_musr@",
as it did not work as expected.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- ChangeLog	16 Jan 2006 11:38:22 -0000	1.47
+++ ChangeLog	16 Jan 2006 21:47:20 -0000	1.48
@@ -1,8 +1,15 @@
 2006-01-16 Richard Bos <richard at radoeka.nl>
-	Patch for  for non openpkg based distributions:
-	* kolab_bootstrap.in: use @ldapserver_usr@ instead of @kolab_musr@ to alter the
-	  ownership of the files $pubreskey $privreskey on the master server.
-	* templates/session_vars.php.template.in: use @webserver_musr@ instead of @kolab_musr@
+	* kolab_bootstrap.in: use @kolab_rgrp@ iso @kolab_rusr@ in chgrp
+	  command.
+	* revert the previous update; use @ldapserver_usr@ instead of
+	  @kolab_musr@, as it did not work as expected.
+
+2006-01-16 Richard Bos <richard at radoeka.nl>
+	* kolab_bootstrap.in: use @ldapserver_usr@ instead of @kolab_musr@ to
+	  alter the ownership of the files $pubreskey $privreskey on the
+	  master server.
+	* templates/session_vars.php.template.in: use @webserver_musr@ instead
+	  of @kolab_musr@
 
 2006-01-15 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- kolab_bootstrap.in	16 Jan 2006 11:38:22 -0000	1.18
+++ kolab_bootstrap.in	16 Jan 2006 21:47:20 -0000	1.19
@@ -668,7 +668,7 @@
     print "Creating RSA keypair for resource password encryption\n";
     kolab_system("@bindir@/openssl genrsa -out $privreskey 1024");
     kolab_system("@bindir@/openssl rsa -in $privreskey -pubout -out $pubreskey");
-    kolab_system("chown @ldapserver_usr@:@kolab_grp@ $pubreskey $privreskey");
+    kolab_system("chown @kolab_musr@:@kolab_grp@ $pubreskey $privreskey");
     chmod 0660, $privreskey, $pubreskey;
     #unlink( "dsa-params" );
     umask $oldmask;
@@ -699,9 +699,9 @@
     kolab_system("@sysconfdir@/kolab/kolab_ca.sh -newkey $fqdn @sysconfdir@/kolab/key.pem");
     kolab_system("@sysconfdir@/kolab/kolab_ca.sh -newreq $fqdn @sysconfdir@/kolab/key.pem @sysconfdir@/kolab/newreq.pem ");
     kolab_system("@sysconfdir@/kolab/kolab_ca.sh -sign @sysconfdir@/kolab/newreq.pem @sysconfdir@/kolab/cert.pem");
-    kolab_system("chgrp @kolab_rusr@ @sysconfdir@/kolab/key.pem;");
+    kolab_system("chgrp @kolab_rgrp@ @sysconfdir@/kolab/key.pem;");
     kolab_system("chmod 0640 @sysconfdir@/kolab/key.pem;");
-    kolab_system("chgrp @kolab_rusr@ @sysconfdir@/kolab/cert.pem;");
+    kolab_system("chgrp @kolab_rgrp@ @sysconfdir@/kolab/cert.pem;");
     kolab_system("chmod 0640 @sysconfdir@/kolab/cert.pem;");
     print <<'EOS';
 ################################################################################



From cvs at intevation.de  Tue Jan 17 18:47:23 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 17 Jan 2006 18:47:23 +0100 (CET)
Subject: bernhard: doc/proko2-doc doc2.sxw,1.68,1.69 
Message-ID: <20060117174723.F1C321005D7@lists.intevation.de>

Author: bernhard

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

Modified Files:
	doc2.sxw 
Log Message:
Reworked the Kontact section a bit:
	* Software Installation: Removed the details of how to build
	  KDE and Kontact in favour for more general remarks that there
	  are two ways to install: per package or from SVN source.
	* fixed hyperlinks towards the KOrganizer and KAddressbook sections
	* added a "(manual settings)" to the appropriate subconfiguration
	  settings to make it more consistent.
	* Removed superflous "c) update" in the table of contents.


Index: doc2.sxw
===================================================================
RCS file: /kolabrepository/doc/proko2-doc/doc2.sxw,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
Binary files /tmp/cvsUOUbQf and /tmp/cvskZcuRl differ



From cvs at intevation.de  Tue Jan 17 19:17:20 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 17 Jan 2006 19:17:20 +0100 (CET)
Subject: bernhard: doc/proko2-doc doc2.sxw,1.69,1.70 
Message-ID: <20060117181720.E813C1005D2@lists.intevation.de>

Author: bernhard

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

Modified Files:
	doc2.sxw 
Log Message:
Reworked the KOrganizer manual settings.
	* inserted two subsubsections: a) General Options b) Free/Busy Lists
	  (tried some cleanup in the surrounding table of contents entries.)
	* Free/Busy subsubsection:
	Mainly added a better description of the Server URL options
	and tried to make this section more consistent.


Index: doc2.sxw
===================================================================
RCS file: /kolabrepository/doc/proko2-doc/doc2.sxw,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
Binary files /tmp/cvsZrcJY6 and /tmp/cvsmJ3Yn9 differ



From cvs at intevation.de  Tue Jan 17 19:32:32 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 17 Jan 2006 19:32:32 +0100 (CET)
Subject: bernhard: doc/www/src documentation.html.m4,1.24,1.25 
Message-ID: <20060117183232.359671005D2@lists.intevation.de>

Author: bernhard

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

Modified Files:
	documentation.html.m4 
Log Message:
New version: doc2-1.70.pdf .


Index: documentation.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/documentation.html.m4,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- documentation.html.m4	19 Dec 2005 06:04:39 -0000	1.24
+++ documentation.html.m4	17 Jan 2006 18:32:30 -0000	1.25
@@ -8,7 +8,7 @@
 
 <ul>
  <li>Server and KDE Client Setup (aka Doc2, pdf: 2.5MB, sxw: 1.9MB):<br>
-     <a href="./doc/doc2-1.65.pdf">Doc2, Version 1.65 as pdf</a>
+     <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>



From cvs at intevation.de  Tue Jan 17 20:20:19 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 17 Jan 2006 20:20:19 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog,1.48,1.49 
Message-ID: <20060117192019.0E07D1005C4@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
introduce *_rpm variables, for checking rpm package versions



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- ChangeLog	16 Jan 2006 21:47:20 -0000	1.48
+++ ChangeLog	17 Jan 2006 19:20:17 -0000	1.49
@@ -1,3 +1,7 @@
+2006-01-17 Marcus Hüwe <suse-tux at gmx.de>
+	Patch committed by Richard Bos
+	* dist_conf/{common,kolab,suse}: introduced *_rpm variables
+
 2006-01-16 Richard Bos <richard at radoeka.nl>
 	* kolab_bootstrap.in: use @kolab_rgrp@ iso @kolab_rusr@ in chgrp
 	  command.



From cvs at intevation.de  Tue Jan 17 20:20:19 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 17 Jan 2006 20:20:19 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf common, 1.16, 1.17 kolab, 1.20,
	1.21 suse, 1.22, 1.23 
Message-ID: <20060117192019.1B3621005C8@lists.intevation.de>

Author: richard

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

Modified Files:
	common kolab suse 
Log Message:
introduce *_rpm variables, for checking rpm package versions



Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- common	15 Jan 2006 20:56:28 -0000	1.16
+++ common	17 Jan 2006 19:20:17 -0000	1.17
@@ -19,11 +19,11 @@
 	-e 's,[@]RPM[@],$(RPM),g' \
 	-e 's,[@]VERSION[@],$(VERSION),g' \
 	-e 's,[@]WITHOPENPKG[@],$(WITHOPENPKG),g' \
-	-e 's,[@]restricted_kolab_grp[@],$(restricted_kolab_grp),g' \
 	-e 's,[@]amavisd_conffile[@],$(amavisd_conffile),g' \
 	-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_rusr[@],$(amavisd_rusr),g' \
 	-e 's,[@]amavisd_templatedir[@],$(amavisd_templatedir),g' \
 	-e 's,[@]amavisd_usr[@],$(amavisd_usr),g' \
@@ -43,11 +43,12 @@
 	-e 's,[@]emailserver_localstatedir[@],$(emailserver_localstatedir),g' \
 	-e 's,[@]emailserver_logfile[@],$(emailserver_logfile),g' \
 	-e 's,[@]emailserver_musr[@],$(emailserver_musr),g' \
+	-e 's,[@]emailserver_rpm[@],$(emailserver_rpm),g' \
 	-e 's,[@]emailserver_socket[@],$(emailserver_socket),g' \
 	-e 's,[@]emailserver_usr[@],$(emailserver_usr),g' \
 	-e 's,[@]fbview_logfile[@],$(fbview_logfile),g' \
-	-e 's,[@]freebusy_logfile[@],$(freebusy_logfile),g' \
 	-e 's,[@]freebusy_cachedir[@],$(freebusy_cachedir),g' \
+	-e 's,[@]freebusy_logfile[@],$(freebusy_logfile),g' \
 	-e 's,[@]freshclam_logfile[@],$(freshclam_logfile),g' \
 	-e 's,[@]freshclam_pidfile[@],$(freshclam_pidfile),g' \
 	-e 's,[@]fsl_logfile[@],$(fsl_logfile),g' \
@@ -68,6 +69,7 @@
 	-e 's,[@]imap_lmtp[@],$(imap_lmtp),g' \
 	-e 's,[@]imap_masterlogfile[@],$(imap_masterlogfile),g' \
 	-e 's,[@]imap_misclogfile[@],$(imap_misclogfile),g' \
+	-e 's,[@]imap_rpm[@],$(imap_rpm),g' \
 	-e 's,[@]imap_sievedir[@],$(imap_sievedir),g' \
 	-e 's,[@]imap_spool[@],$(imap_spool),g' \
 	-e 's,[@]imap_statedir[@],$(imap_statedir),g' \
@@ -79,11 +81,14 @@
 	-e 's,[@]kolab_musr[@],$(kolab_musr),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' \
 	-e 's,[@]kolab_statedir[@],$(kolab_statedir),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,[@]ldapserver_argsfile[@],$(ldapserver_argsfile),g' \
 	-e 's,[@]ldapserver_confdir[@],$(ldapserver_confdir),g' \
 	-e 's,[@]ldapserver_dir[@],$(ldapserver_dir),g' \
@@ -95,12 +100,13 @@
 	-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,[@]pkgdocdir[@],$(pkgdocdir),g' \
 	-e 's,[@]resmgr_confdir[@],$(resmgr_confdir),g' \
+	-e 's,[@]resmgr_filterdir[@],$(resmgr_filterdir),g' \
 	-e 's,[@]resmgr_grp[@],$(resmgr_grp),g' \
 	-e 's,[@]resmgr_logfile[@],$(resmgr_logfile),g' \
 	-e 's,[@]resmgr_usr[@],$(resmgr_usr),g' \
-	-e 's,[@]resmgr_filterdir[@],$(resmgr_filterdir),g' \
 	-e 's,[@]sasl_authdconffile[@],$(sasl_authdconffile),g' \
 	-e 's,[@]sasl_logfile[@],$(sasl_logfile),g' \
 	-e 's,[@]sasl_smtpconffile[@],$(sasl_smtpconffile),g' \
@@ -113,6 +119,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_runtime_status[@],$(webserver_runtime_status),g' \
 	-e 's,[@]webserver_sessions[@],$(webserver_sessions),g' \
 	-e 's,[@]webserver_sslmutex[@],$(webserver_sslmutex),g' \

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- kolab	15 Jan 2006 20:56:28 -0000	1.20
+++ kolab	17 Jan 2006 19:20:17 -0000	1.21
@@ -42,6 +42,7 @@
 amavisd_usr=kolab
 # @l_rgrp@
 amavisd_grp=kolab-r
+amavisd_rpm=amavisd
 
 
 fsl_logfile=${localstatedir}/fsl/fsl.log
@@ -75,6 +76,7 @@
 emailserver_grp=kolab-r
 # @l_musr@
 emailserver_mail_usr=kolab
+emailserver_rpm=postfix
 
 ftpserver_scoreboardfile=${localstatedir}/proftpd/score
 ftpserver_logfile=${localstatedir}/proftpd/proftpd.log
@@ -99,11 +101,16 @@
 imap_spool=${imap_statedir}/spool
 imap_sievedir=${imap_statedir}/sieve
 imap_lmtp=${imap_statedir}/lmtp
+imap_rpm=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
 
 ldapserver_statedir=${localstatedir}/openldap
 ldapserver_dir=${ldapserver_statedir}/openldap-data
@@ -139,6 +146,7 @@
 webserver_musr=kolab
 webserver_usr=${kolab_usr}
 webserver_grp=${kolab_grp}
+webserver_rpm=apache
 
 phplibdir=${libdir}/php
 phplibdir2=${kolab_statedir}/php
@@ -166,5 +174,3 @@
 graveyard_tscache=${localstatedir}/kolab/graveyard_tscache.db
 
 backupdir=${sysconfdir}/kolab
-
-

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- suse	16 Jan 2006 11:38:22 -0000	1.22
+++ suse	17 Jan 2006 19:20:17 -0000	1.23
@@ -30,6 +30,7 @@
 amavisd_rusr=vscan
 amavisd_usr=root
 amavisd_grp=root
+amavisd_rpm=amavisd-new
 
 fsl_logfile=${localstatedir}/log/fsl
 
@@ -58,6 +59,7 @@
 emailserver_musr=maildrop
 emailserver_grp=root
 emailserver_mail_usr=maildrop
+emailserver_rpm=postfix
 
 ftpserver_scoreboardfile=${localstatedir}/proftpd/score
 ftpserver_logfile=${localstatedir}/log/proftpd.log
@@ -80,11 +82,16 @@
 imap_spool=${localstatedir}/spool/imap
 imap_sievedir=${localstatedir}/lib/sieve
 imap_lmtp=${imap_statedir}/lmtp
+imap_rpm=cyrus-imapd
 
 kolab_statedir=${localstatedir}/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
+perl_kolab_rpm=perl-kolab
 
 ldapserver_statedir=${localstatedir}/lib/ldap
 ldapserver_dir=${localstatedir}/lib/ldap
@@ -116,6 +123,7 @@
 webserver_musr=wwwrun
 webserver_usr=wwwrun
 webserver_grp=www
+webserver_rpm=apache2
 
 phplibdir=${datadir}/php
 phplibdir2=${datadir}/php
@@ -153,4 +161,3 @@
 	/etc/postfix/virtual \
 	/etc/sysconfig/ldap \
 	/etc/sysconfig/saslauthd
-	



From cvs at intevation.de  Tue Jan 17 20:20:22 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 17 Jan 2006 20:20:22 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/www/admin/kolab
	versions.php.in, 1.1, 1.2 
Message-ID: <20060117192022.E59CE1006BE@lists.intevation.de>

Author: richard

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

Modified Files:
	versions.php.in 
Log Message:
use rpm package name variables for the software package version query's



Index: versions.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/kolab/versions.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- versions.php.in	16 Jan 2006 18:36:15 -0000	1.1
+++ versions.php.in	17 Jan 2006 19:20:20 -0000	1.2
@@ -23,9 +23,14 @@
 /**** Page logic ****/
 
 // Remember to keep this list up to date when patching packages!
-$kolabversions = shell_exec("@RPM@ -q perl-kolab kolabd kolab-resource-handlers kolab-webadmin" );
-$kolabpatchedversions = shell_exec("@RPM@ -q amavisd apache imapd postfix" );
-$openpkgversion = shell_exec("@RPM@ -q openpkg");
+$kolabversions = shell_exec("@RPM@ -q @perl_kolab_rpm@ @kolab_rpm@ @kolab_resource_handlers_rpm@ @kolab_webadmin_rpm@" );
+$kolabpatchedversions = shell_exec("@RPM@ -q @amavisd_rpm@ @webserver_rpm@ @imap_rpm@ @emailserver_rpm@" );
+
+# 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");
+}
 
 $kolabversion = '@kolab_version@';
 if( $kolabversion[0] == '@' ) {



From cvs at intevation.de  Tue Jan 17 20:20:22 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 17 Jan 2006 20:20:22 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog,1.16,1.17 
Message-ID: <20060117192022.E3D6B1006BD@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
use rpm package name variables for the software package version query's



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- ChangeLog	15 Jan 2006 21:05:54 -0000	1.16
+++ ChangeLog	17 Jan 2006 19:20:20 -0000	1.17
@@ -1,3 +1,8 @@
+2006-01-16 Marcus Hüwe <suse-tux at gmx.de>
+	Patch committed by Richard Bos
+	* www/admin/kolab/versions.php.in: use rpm package name variables for
+	  the software package version query's
+
 2006-01-15 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos
 	* www/admin/kolab/versions.php: moved to /www/admin/kolab/versions.php.in,



From cvs at intevation.de  Tue Jan 17 20:49:20 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 17 Jan 2006 20:49:20 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog, 1.49, 1.50 kolab_bootstrap.in,
	1.19, 1.20 
Message-ID: <20060117194920.321191005C9@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog kolab_bootstrap.in 
Log Message:
use @ldapserver_rgrp@ variable to determine the group for the files
key.pem and cert.pem




Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- ChangeLog	17 Jan 2006 19:20:17 -0000	1.49
+++ ChangeLog	17 Jan 2006 19:49:18 -0000	1.50
@@ -1,6 +1,8 @@
 2006-01-17 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos
-	* dist_conf/{common,kolab,suse}: introduced *_rpm variables
+	* dist_conf/{common,kolab,suse}: introduced *_rpm variables and
+	  ldapserver_rgrp variable.
+	* kolab_bootstrap.in: use @ldapserver_rgrp@ variable
 
 2006-01-16 Richard Bos <richard at radoeka.nl>
 	* kolab_bootstrap.in: use @kolab_rgrp@ iso @kolab_rusr@ in chgrp

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- kolab_bootstrap.in	16 Jan 2006 21:47:20 -0000	1.19
+++ kolab_bootstrap.in	17 Jan 2006 19:49:18 -0000	1.20
@@ -699,9 +699,9 @@
     kolab_system("@sysconfdir@/kolab/kolab_ca.sh -newkey $fqdn @sysconfdir@/kolab/key.pem");
     kolab_system("@sysconfdir@/kolab/kolab_ca.sh -newreq $fqdn @sysconfdir@/kolab/key.pem @sysconfdir@/kolab/newreq.pem ");
     kolab_system("@sysconfdir@/kolab/kolab_ca.sh -sign @sysconfdir@/kolab/newreq.pem @sysconfdir@/kolab/cert.pem");
-    kolab_system("chgrp @kolab_rgrp@ @sysconfdir@/kolab/key.pem;");
+    kolab_system("chgrp @ldapserver_rgrp@ @sysconfdir@/kolab/key.pem;");
     kolab_system("chmod 0640 @sysconfdir@/kolab/key.pem;");
-    kolab_system("chgrp @kolab_rgrp@ @sysconfdir@/kolab/cert.pem;");
+    kolab_system("chgrp @ldapserver_rgrp@ @sysconfdir@/kolab/cert.pem;");
     kolab_system("chmod 0640 @sysconfdir@/kolab/cert.pem;");
     print <<'EOS';
 ################################################################################
@@ -886,9 +886,9 @@
     kolab_system("scp $master_host:@sysconfdir@/kolab/$fqdn.pem @sysconfdir@/kolab/cert.pem");
     kolab_system("ssh -CA $master_host \"rm @sysconfdir@/kolab/$fqdn.pem @sysconfdir@/kolab/$fqdn-req.pem\"");
     die("Creation of @sysconfdir@/kolab/cert.pem failed") unless -f "@sysconfdir@/kolab/cert.pem";
-    kolab_system("chgrp @kolab_rgrp@ @sysconfdir@/kolab/key.pem;");
+    kolab_system("chgrp @ldapserver_rgrp@ @sysconfdir@/kolab/key.pem;");
     kolab_system("chmod 0640 @sysconfdir@/kolab/key.pem;");
-    kolab_system("chgrp @kolab_rgrp@ @sysconfdir@/kolab/cert.pem;");
+    kolab_system("chgrp @ldapserver_rgrp@ @sysconfdir@/kolab/cert.pem;");
     kolab_system("chmod 0640 @sysconfdir@/kolab/cert.pem;");
     
     print <<'EOS';



From cvs at intevation.de  Tue Jan 17 20:49:20 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 17 Jan 2006 20:49:20 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf common, 1.17, 1.18 kolab, 1.21,
	1.22 suse, 1.23, 1.24 
Message-ID: <20060117194920.3E10A1005CD@lists.intevation.de>

Author: richard

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

Modified Files:
	common kolab suse 
Log Message:
use @ldapserver_rgrp@ variable to determine the group for the files
key.pem and cert.pem




Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- common	17 Jan 2006 19:20:17 -0000	1.17
+++ common	17 Jan 2006 19:49:18 -0000	1.18
@@ -96,6 +96,7 @@
 	-e 's,[@]ldapserver_logfile[@],$(ldapserver_logfile),g' \
 	-e 's,[@]ldapserver_pidfile[@],$(ldapserver_pidfile),g' \
 	-e 's,[@]ldapserver_replogfile[@],$(ldapserver_replogfile),g' \
+	-e 's,[@]ldapserver_rgrp[@],$(ldapserver_rgrp),g' \
 	-e 's,[@]ldapserver_schemadir[@],$(ldapserver_schemadir),g' \
 	-e 's,[@]ldapserverslurpd_pidfile[@],$(ldapserverslurpd_pidfile),g' \
 	-e 's,[@]ldapserver_statedir[@],$(ldapserver_statedir),g' \

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- kolab	17 Jan 2006 19:20:17 -0000	1.21
+++ kolab	17 Jan 2006 19:49:18 -0000	1.22
@@ -126,6 +126,7 @@
 ldapserver_usr=kolab
 # @l_mgrp@
 ldapserver_grp=kolab
+ldapserver_rgrp=kolab-r
 
 webserver_document_root=${localstatedir}/kolab/www
 webserver_cgidir=${webserver_document_root}/cgi-bin

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- suse	17 Jan 2006 19:20:17 -0000	1.23
+++ suse	17 Jan 2006 19:49:18 -0000	1.24
@@ -104,6 +104,7 @@
 ldapserver_confdir=${sysconfdir}/openldap
 ldapserver_usr=ldap
 ldapserver_grp=ldap
+ldapserver_rgrp=ldap
 
 webserver_document_root=/srv/www/htdocs
 webserver_cgidir=${webserver_document_root}/cgi-bin



From cvs at intevation.de  Tue Jan 17 21:00:56 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 17 Jan 2006 21:00:56 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
	messages.po, 1.12, 1.13 
Message-ID: <20060117200056.71FF01005C9@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
fix typo

Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES/messages.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- messages.po	15 Jan 2006 22:09:36 -0000	1.12
+++ messages.po	17 Jan 2006 20:00:54 -0000	1.13
@@ -1330,7 +1330,7 @@
 #: ../../../www/admin/administrator/admin.php:289
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php:271
 msgid " successfully created"
-msgstr "Aanmaken gelukt"
+msgstr " aanmaken gelukt"
 
 #: ../../../www/admin/user/user.php:719 ../../../www/admin/user/user.php:725
 #: ../../../www/admin/user/user.php:736 ../include/menu.php:30



From cvs at intevation.de  Tue Jan 17 21:12:43 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 17 Jan 2006 21:12:43 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
	messages.po, 1.13, 1.14 
Message-ID: <20060117201243.B83811005C9@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
fix typo

Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES/messages.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- messages.po	17 Jan 2006 20:00:54 -0000	1.13
+++ messages.po	17 Jan 2006 20:12:41 -0000	1.14
@@ -747,7 +747,7 @@
 
 #: tpl_messages.php:168
 msgid "Always reject the message."
-msgstr "Het bericht altijd afwijzen"
+msgstr "Het bericht altijd afwijzen. "
 
 #: tpl_messages.php:169
 msgid ""



From cvs at intevation.de  Tue Jan 17 23:06:44 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 17 Jan 2006 23:06:44 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/templates
	versions.tpl.in, NONE, 1.1 versions.tpl, 1.2, NONE 
Message-ID: <20060117220644.ACB601005C9@lists.intevation.de>

Author: richard

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

Added Files:
	versions.tpl.in 
Removed Files:
	versions.tpl 
Log Message:
php/admin/templates/versions.tpl.in: show openpkg information when
installed on an openpkg system only.



--- NEW FILE: versions.tpl.in ---
{* Smarty Template *}
{*
  Local variables:
  buffer-file-coding-system: utf-8
  End:
*}
<div class="contenttext">
<h1>{tr msg="Kolab2 Groupware Server Version"}</h1>
<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>
@OPENPKG@<h1>{tr msg="OpenPKG Version"}</h1>
@OPENPKG@<pre>{$openpkgversion}</pre>
</div>

--- versions.tpl DELETED ---



From cvs at intevation.de  Tue Jan 17 23:06:44 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 17 Jan 2006 23:06:44 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.17,
	1.18 Makefile.am, 1.31, 1.32 configure.ac, 1.22, 1.23 
Message-ID: <20060117220644.AFB6B1005CD@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog Makefile.am configure.ac 
Log Message:
php/admin/templates/versions.tpl.in: show openpkg information when
installed on an openpkg system only.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- ChangeLog	17 Jan 2006 19:20:20 -0000	1.17
+++ ChangeLog	17 Jan 2006 22:06:42 -0000	1.18
@@ -2,6 +2,12 @@
 	Patch committed by Richard Bos
 	* www/admin/kolab/versions.php.in: use rpm package name variables for
 	  the software package version query's
+	* php/admin/templates/versions.tpl: moved to
+	  php/admin/templates/versions.tpl.in
+	* php/admin/templates/versions.tpl.in: show openpkg information when
+	  installed on an openpkg system only.
+	* Makefile.am: process php/admin/templates/versions.tpl.in
+	* configure.ac: add --with-openpkg cmdline argument
 
 2006-01-15 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- Makefile.am	15 Jan 2006 21:05:54 -0000	1.31
+++ Makefile.am	17 Jan 2006 22:06:42 -0000	1.32
@@ -132,7 +132,6 @@
 	php/admin/templates/maintainerlistall.tpl \
 	php/admin/templates/domainmaintainerlistall.tpl \
 	php/admin/templates/kolab.tpl \
-	php/admin/templates/versions.tpl \
 	php/admin/templates/addrlistall.tpl \
 	php/admin/templates/forward.tpl \
 	php/admin/templates/deliver.tpl \
@@ -149,7 +148,9 @@
 	php/admin/templates/admindeleted.tpl
 
 phptemplatesdir = $(phpkolabdir)/templates
-dist_phptemplates_DATA = $(PHP_TEMPLATES)
+phptemplates_DATA = $(PHP_TEMPLATES) \
+	php/admin/templates/versions.tpl
+EXTRA_DIST += $(PHP_TEMPLATES)
 
 
 ### i18n stuff
@@ -218,6 +219,16 @@
 	$(do_subst) <$(srcdir)/php/admin/templates/page.tpl.in >$@
 CLEANFILES += php/admin/templates/page.tpl
 EXTRA_DIST += php/admin/templates/page.tpl.in
+
+php/admin/templates/versions.tpl:
+	@$(mkinstalldirs) php/admin/templates
+if OPENPKG
+	sed 's/^@OPENPKG@//' <$(srcdir)/php/admin/templates/versions.tpl.in >$@
+else
+	sed 's/^@OPENPKG at .*//' <$(srcdir)/php/admin/templates/versions.tpl.in >$@
+endif
+CLEANFILES += php/admin/templates/versions.tpl
+EXTRA_DIST += php/admin/templates/versions.tpl.in
 
 www/admin/logout.php:
 	@$(mkinstalldirs) www/admin

Index: configure.ac
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/configure.ac,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- configure.ac	14 Jan 2006 22:16:05 -0000	1.22
+++ configure.ac	17 Jan 2006 22:06:42 -0000	1.23
@@ -22,6 +22,16 @@
 common=dist_conf/common
 AC_SUBST_FILE(common)
 
+AC_ARG_WITH([openpkg],
+  [AC_HELP_STRING([--with-openpkg],
+    [Special Files for the openpkg platform])],
+  [case "${withval}" in
+    yes) openpkg=true ;;
+	 no)  openpkg=false ;;
+	 *)   AC_MSG_ERROR(bad value ${withval} for --with-openpkg) ;;
+  esac],[openpkg=true])
+AM_CONDITIONAL(OPENPKG, test x$openpkg = xtrue)
+
 # Checks for libraries.
 
 # Checks for header files.



From cvs at intevation.de  Wed Jan 18 20:35:19 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 18 Jan 2006 20:35:19 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.18,
	1.19 Makefile.am, 1.32, 1.33 
Message-ID: <20060118193519.D76AA1005C4@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
corrected make rule for php/admin/templates/versions.tpl



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- ChangeLog	17 Jan 2006 22:06:42 -0000	1.18
+++ ChangeLog	18 Jan 2006 19:35:17 -0000	1.19
@@ -1,3 +1,6 @@
+2006-01-17 Richard Bos <richard at radoeka.nl>
+	* Makefile.am: corrected make rule for php/admin/templates/versions.tpl
+
 2006-01-16 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos
 	* www/admin/kolab/versions.php.in: use rpm package name variables for
@@ -23,7 +26,6 @@
 	* kolab-webadmin.spec.in: replaced --enable-dist with --with-dist
 
 2006-01-03 Richard Bos <richard at radoeka.nl>
-
 	* Makefile.am: distribute only the files to be distributed
 	  from the dist_conf directory
 	  Added a distclean-local rule to remove the directory autom4te.cache

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- Makefile.am	17 Jan 2006 22:06:42 -0000	1.32
+++ Makefile.am	18 Jan 2006 19:35:17 -0000	1.33
@@ -225,7 +225,7 @@
 if OPENPKG
 	sed 's/^@OPENPKG@//' <$(srcdir)/php/admin/templates/versions.tpl.in >$@
 else
-	sed 's/^@OPENPKG at .*//' <$(srcdir)/php/admin/templates/versions.tpl.in >$@
+	sed '/^@OPENPKG at .*/d' <$(srcdir)/php/admin/templates/versions.tpl.in >$@
 endif
 CLEANFILES += php/admin/templates/versions.tpl
 EXTRA_DIST += php/admin/templates/versions.tpl.in



From cvs at intevation.de  Wed Jan 18 20:43:13 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 18 Jan 2006 20:43:13 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog,1.50,1.51 
Message-ID: <20060118194313.84A201005C4@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
introduced new variables for postfix emailserver_mail_owner,
emailserver_setgid_grp, emailserver_default_privs and emailserver_master_usr



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- ChangeLog	17 Jan 2006 19:49:18 -0000	1.50
+++ ChangeLog	18 Jan 2006 19:43:11 -0000	1.51
@@ -1,3 +1,12 @@
+2006-01-18 Richard Bos <richard at radoeka.nl>
+	* dist_conf/common,
+	* dist_conf/kolab,
+	* dist_conf/suser,
+	* templates/main.cf.template.in,
+	* templates/master.cf.template.in: introduced new variables for postfix
+	  emailserver_mail_owner, emailserver_setgid_grp,
+	  emailserver_default_privs and emailserver_master_usr
+
 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



From cvs at intevation.de  Wed Jan 18 20:43:13 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 18 Jan 2006 20:43:13 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf common, 1.18, 1.19 kolab, 1.22,
	1.23 suse, 1.24, 1.25 
Message-ID: <20060118194313.94AC11006A7@lists.intevation.de>

Author: richard

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

Modified Files:
	common kolab suse 
Log Message:
introduced new variables for postfix emailserver_mail_owner,
emailserver_setgid_grp, emailserver_default_privs and emailserver_master_usr



Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- common	17 Jan 2006 19:49:18 -0000	1.18
+++ common	18 Jan 2006 19:43:11 -0000	1.19
@@ -39,11 +39,15 @@
 	-e 's,[@]clamav_socket[@],$(clamav_socket),g' \
 	-e 's,[@]clamav_usr[@],$(clamav_usr),g' \
 	-e 's,[@]emailserver_confdir[@],$(emailserver_confdir),g' \
+	-e 's,[@]emailserver_default_privs[@],$(emailserver_default_privs),g' \
 	-e 's,[@]emailserver_grp[@],$(emailserver_grp),g' \
 	-e 's,[@]emailserver_localstatedir[@],$(emailserver_localstatedir),g' \
 	-e 's,[@]emailserver_logfile[@],$(emailserver_logfile),g' \
+	-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_setgid_grp[@],$(emailserver_setgid_grp),g' \
 	-e 's,[@]emailserver_socket[@],$(emailserver_socket),g' \
 	-e 's,[@]emailserver_usr[@],$(emailserver_usr),g' \
 	-e 's,[@]fbview_logfile[@],$(fbview_logfile),g' \

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- kolab	17 Jan 2006 19:49:18 -0000	1.22
+++ kolab	18 Jan 2006 19:43:11 -0000	1.23
@@ -76,6 +76,10 @@
 emailserver_grp=kolab-r
 # @l_musr@
 emailserver_mail_usr=kolab
+emailserver_mail_owner=kolab
+emailserver_setgid_grp=kolab-r
+emailserver_default_privs=kolab-n
+emailserver_master_usr=kolab-n
 emailserver_rpm=postfix
 
 ftpserver_scoreboardfile=${localstatedir}/proftpd/score

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- suse	17 Jan 2006 19:49:18 -0000	1.24
+++ suse	18 Jan 2006 19:43:11 -0000	1.25
@@ -55,10 +55,13 @@
 emailserver_socket=${libdir}/postfix/lmtp
 emailserver_localstatedir=${localstatedir}/spool/postfix
 emailserver_logfile=${localstatedir}/log/postfix.log
-emailserver_usr=postfix
-emailserver_musr=maildrop
+emailserver_usr=root
 emailserver_grp=root
 emailserver_mail_usr=maildrop
+emailserver_mail_owner=postfix
+emailserver_setgid_grp=maildrop
+emailserver_default_privs=nobody
+emailserver_master_usr=nobody
 emailserver_rpm=postfix
 
 ftpserver_scoreboardfile=${localstatedir}/proftpd/score



From cvs at intevation.de  Wed Jan 18 20:43:13 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 18 Jan 2006 20:43:13 +0100 (CET)
Subject: richard: server/kolabd/kolabd/templates main.cf.template.in, 1.7,
	1.8 master.cf.template.in, 1.7, 1.8 
Message-ID: <20060118194313.9BA151006B7@lists.intevation.de>

Author: richard

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

Modified Files:
	main.cf.template.in master.cf.template.in 
Log Message:
introduced new variables for postfix emailserver_mail_owner,
emailserver_setgid_grp, emailserver_default_privs and emailserver_master_usr



Index: main.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- main.cf.template.in	11 Jan 2006 14:40:41 -0000	1.7
+++ main.cf.template.in	18 Jan 2006 19:43:11 -0000	1.8
@@ -25,9 +25,9 @@
 queue_directory = @emailserver_localstatedir@
 
 #   users
-mail_owner= @emailserver_musr@
-setgid_group= @emailserver_grp@
-default_privs= @emailserver_usr@
+mail_owner= @emailserver_mail_owner@
+setgid_group= @emailserver_setgid_grp@
+default_privs= @emailserver_default_privs@
 
 #   local host
 myhostname = @@@fqdnhostname@@@

Index: master.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- master.cf.template.in	11 Jan 2006 14:40:41 -0000	1.7
+++ master.cf.template.in	18 Jan 2006 19:43:11 -0000	1.8
@@ -84,9 +84,9 @@
     -o smtpd_error_sleep_time=0
     -o smtpd_soft_error_limit=1001
     -o smtpd_hard_error_limit=1000
-kolabpolicy    unix  -       n       n       -       -       spawn user=@emailserver_usr@ argv=@sysconfdir@/kolab/kolab_smtpdpolicy 
+kolabpolicy    unix  -       n       n       -       -       spawn user=@emailserver_master_usr@ argv=@sysconfdir@/kolab/kolab_smtpdpolicy 
 
-kolabfilter     unix  -       n       n       -       -       pipe user=@emailserver_usr@ flags=n argv=@bindir@/php
+kolabfilter     unix  -       n       n       -       -       pipe user=@emailserver_master_usr@ flags=n argv=@bindir@/php
     -c @webserver_confdir@/php.ini
     -f @resmgr_confdir@/kolabfilter.php 
     --
@@ -96,7 +96,7 @@
     -c ${client_address}
     -u ${sasl_username}
 
-kolabmailboxfilter     unix  -       n       n       -       -       pipe user=@emailserver_usr@ flags=n argv=@bindir@/php
+kolabmailboxfilter     unix  -       n       n       -       -       pipe user=@emailserver_master_usr@ flags=n argv=@bindir@/php
     -c @webserver_confdir@/php.ini
     -f @resmgr_confdir@/kolabmailboxfilter.php 
     --



From cvs at intevation.de  Wed Jan 18 20:48:20 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 18 Jan 2006 20:48:20 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog,1.51,1.52 
Message-ID: <20060118194820.4BF231005C4@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
add /etc/php.ini file to the list with files to be back-upped



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- ChangeLog	18 Jan 2006 19:43:11 -0000	1.51
+++ ChangeLog	18 Jan 2006 19:48:18 -0000	1.52
@@ -1,4 +1,7 @@
 2006-01-18 Richard Bos <richard at radoeka.nl>
+	* dist_conf/suser: add /etc/php.ini to the backup list.
+
+2006-01-18 Richard Bos <richard at radoeka.nl>
 	* dist_conf/common,
 	* dist_conf/kolab,
 	* dist_conf/suser,



From cvs at intevation.de  Wed Jan 18 20:48:20 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 18 Jan 2006 20:48:20 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf suse,1.25,1.26 
Message-ID: <20060118194820.527B71006A7@lists.intevation.de>

Author: richard

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

Modified Files:
	suse 
Log Message:
add /etc/php.ini file to the list with files to be back-upped



Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- suse	18 Jan 2006 19:43:11 -0000	1.25
+++ suse	18 Jan 2006 19:48:18 -0000	1.26
@@ -155,6 +155,7 @@
 # One time backup files.  These original distribution configuration files
 # will be backed up once, just before kolab is about to change those files.
 backupfiles=/etc/amavisd.conf \
+	/etc/php.ini \
 	/etc/cyrus.conf \
 	/etc/imapd.conf \
 	/etc/openldap/slapd.conf \



From cvs at intevation.de  Wed Jan 18 20:54:45 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 18 Jan 2006 20:54:45 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog,1.52,1.53 
Message-ID: <20060118195445.32EB51005C4@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
Remove variable emailserver_mail_usr, it is not used anymore



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- ChangeLog	18 Jan 2006 19:48:18 -0000	1.52
+++ ChangeLog	18 Jan 2006 19:54:43 -0000	1.53
@@ -9,6 +9,7 @@
 	* templates/master.cf.template.in: introduced new variables for postfix
 	  emailserver_mail_owner, emailserver_setgid_grp,
 	  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>
 	Patch committed by Richard Bos



From cvs at intevation.de  Wed Jan 18 20:54:45 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 18 Jan 2006 20:54:45 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf debian, 1.3, 1.4 kolab, 1.23,
	1.24 suse, 1.26, 1.27 
Message-ID: <20060118195445.3B8451006A7@lists.intevation.de>

Author: richard

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

Modified Files:
	debian kolab suse 
Log Message:
Remove variable emailserver_mail_usr, it is not used anymore



Index: debian
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/debian,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- debian	15 Jan 2006 20:32:47 -0000	1.3
+++ debian	18 Jan 2006 19:54:43 -0000	1.4
@@ -55,7 +55,6 @@
 emailserver_usr=${kolab_usr}
 emailserver_musr=kolab
 emailserver_grp=${restricted_kolab_grp}
-emailserver_mail_usr=kolab
 
 ftpserver_scoreboardfile=${localstatedir}/proftpd/score
 ftpserver_logfile=${localstatedir}/log/proftpd.log

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- kolab	18 Jan 2006 19:43:11 -0000	1.23
+++ kolab	18 Jan 2006 19:54:43 -0000	1.24
@@ -75,7 +75,6 @@
 emailserver_musr=kolab
 emailserver_grp=kolab-r
 # @l_musr@
-emailserver_mail_usr=kolab
 emailserver_mail_owner=kolab
 emailserver_setgid_grp=kolab-r
 emailserver_default_privs=kolab-n

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- suse	18 Jan 2006 19:48:18 -0000	1.26
+++ suse	18 Jan 2006 19:54:43 -0000	1.27
@@ -57,7 +57,6 @@
 emailserver_logfile=${localstatedir}/log/postfix.log
 emailserver_usr=root
 emailserver_grp=root
-emailserver_mail_usr=maildrop
 emailserver_mail_owner=postfix
 emailserver_setgid_grp=maildrop
 emailserver_default_privs=nobody



From cvs at intevation.de  Thu Jan 19 16:33:57 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu, 19 Jan 2006 16:33:57 +0100 (CET)
Subject: thomas: utils/admin - New directory 
Message-ID: <20060119153357.54709100160@lists.intevation.de>

Author: thomas

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

Log Message:
Directory /kolabrepository/utils/admin added to the repository




From cvs at intevation.de  Thu Jan 19 16:35:20 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu, 19 Jan 2006 16:35:20 +0100 (CET)
Subject: thomas: utils/admin kolab_vacation_tool, NONE,
	1.1 kolab_vacation_tool.README, NONE, 1.1 
Message-ID: <20060119153520.9B14F1005A0@lists.intevation.de>

Author: thomas

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

Added Files:
	kolab_vacation_tool kolab_vacation_tool.README 
Log Message:
Added PHP script to change vacation settings for users.
Currently only changing the vacation domain is supported.


--- NEW FILE: kolab_vacation_tool ---
#!/kolab/bin/php
<?php
/*
 *  Copyright (c) 2005 Intevation GmbH
 *
 *    Writen by Thomas Arendsen Hein <thomas at intevation.de>
 *
 *  This  program is free  software; you can redistribute  it and/or
 *  modify it  under the terms of the GNU  General Public License as
 *  published by the  Free Software Foundation; either version 2, or
 *  (at your option) any later version.
 *
 *  This program is  distributed in the hope that it will be useful,
 *  but WITHOUT  ANY WARRANTY; without even the  implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 *  General Public License for more details.
 *
 *  You can view the  GNU General Public License, online, at the GNU
 *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
 */

$include_path = ini_get('include_path');
ini_set( 'include_path',
         '.:/kolab/var/kolab/php:/kolab/var/kolab/php/pear:'.$include_path);

require_once 'admin/include/sieveutils.class.php';
require_once 'PEAR.php';

include_once 'admin/include/Sieve.php';

function load_kolab_conf () {
  $kolab_conf = array();
  foreach(file('/kolab/etc/kolab/kolab.conf') as $line) {
    list($key, $value) = split(':', $line, 2);
    $kolab_conf[trim($key)] = trim($value);
  }
  $kolab_conf['manager'] = 'manager'; // XXX
  return $kolab_conf;
}


function user_homeserver ( $kolab_conf, $user_list ) {
  $users = array();

  // Connect to the LDAP server
  $ldap = ldap_connect($kolab_conf['ldap_uri']);
  if (!ldap_bind($ldap, $kolab_conf['bind_dn'], $kolab_conf['bind_pw'])) {
      fwrite(STDOUT, 'Unable to contact LDAP server: ' . ldap_error($ldap));
      exit(1);
  }

  foreach($user_list as $user) {
    $result = ldap_search($ldap, $kolab_conf['base_dn'],
                          "(&(objectClass=kolabInetOrgPerson)(uid=*)(mail=*)(sn=*)(kolabHomeServer=*)(|(mail=$user)(uid=$user)))",
                          array("mail", "kolabHomeServer"));
    if (!$result) {
      fwrite(STDOUT, 'Unable to perform LDAP search: ' . ldap_error($ldap));
      exit(1);
    }
    $entries = ldap_get_entries($ldap, $result);
    unset($entries['count']);
    if( count($entries) > 0 ) {
      foreach($entries as $entry) {
        $users[$entry['mail'][0]] = $entry['kolabhomeserver'][0];
      }
    } else {
      fwrite(STDOUT, "$user: Not found!\n");
    }
  }

  return $users;
}


function sieve_maildomain ( $auth, $pass, $host, $user, $new_maildomain ) {
  $errors = array();

  $scriptname = 'kolab-vacation.siv';

  $sieve =& new Net_Sieve( $auth, $pass, $host, 2000, '', $user );
  if( PEAR::isError( $sieve->_error ) ) {
    $errors[] = $sieve->_error->getMessage();
    return $errors;
  }

  $addresses = $days = $text = false;
  if( PEAR::isError( $scripts = $sieve->listScripts() ) ) {
    $errors[] = $scripts->getMessage();
    return $errors;
  }
  if( in_array( $scriptname, $scripts ) ) {
    $script = $sieve->getScript($scriptname);
    $maildomain = SieveUtils::getMailDomain( $script );
    $reacttospam = SieveUtils::getReactToSpam( $script );
    $addresses = SieveUtils::getVacationAddresses( $script );
    $days = SieveUtils::getVacationDays( $script );
    $text = SieveUtils::getVacationText( $script );
  } else $reacttospam = true;
  if( $addresses === false ) $addresses = array( "" );
  $active = ( $sieve->getActive() === $scriptname );

  if( $maildomain != $new_maildomain ) {

    $script = 
      "require \"vacation\";\r\n\r\n".
      (!empty($new_maildomain)?"if not address :domain :contains \"From\" \"".$new_maildomain."\" { keep; stop; }\r\n":"").
      ($reacttospam?"if header :contains \"X-Spam-Flag\" \"YES\" { keep; stop; }\r\n":"").
      ($addresses && $text && $days ?
      "vacation :addresses [ \"".join('", "', $addresses )."\" ] :days ".$days." text:\r\n".
      SieveUtils::dotstuff($text).".\r\n;":"")."\r\n\r\n";

    if( PEAR::isError( $res = $sieve->installScript( $scriptname, $script, $active ) ) ) {
      $errors[] = $res->getMessage();
      $errors[] = 'Script was:';
      $errors[] = $script;
      return $errors;
    }

    fwrite(STDOUT, "$user: \"$maildomain\" -> \"$new_maildomain\" on $host\n");
  } else {
    fwrite(STDOUT, "$user: already set to \"$new_maildomain\" on $host\n");
  }
}


// main

if( count($argv) < 3 ) {
  fwrite(STDOUT, "Usage: $argv[0] MAILDOMAIN USERPATTERN...\n");
  fwrite(STDOUT, "Set vacation parameter \"Only react to mail coming from domain\"\n");
  fwrite(STDOUT, "for Kolab users matching a given pattern. Wildcard is \"*\".\n");
  exit(1);
}

$kolab_conf = load_kolab_conf();

$argv = $_SERVER['argv'];
unset($argv[0]);
$new_maildomain = $argv[1];
unset($argv[1]);

$users = user_homeserver($kolab_conf, $argv);
if( count($users) < 1 ) {
  fwrite(STDOUT, "No matching users found.\n");
  exit(0);
}

foreach($users as $user => $homeserver) {
  $errors = sieve_maildomain ( $kolab_conf['manager'], $kolab_conf['bind_pw'], $homeserver, $user, $new_maildomain );
  if( $errors ) {
    fwrite(STDOUT, "Error while setting vacation maildomain for user ".$user.":\n");
    foreach($errors as $line) {
      fwrite(STDOUT, $line."\n");
    }
  }
}

exit(0);

/*
  Local variables:
  mode: php
  buffer-file-coding-system: utf-8
  End:
  vim:encoding=utf-8 sts=2 sw=2 et:
 */
?>

--- NEW FILE: kolab_vacation_tool.README ---
kolab_vacation_tool
===================

Update vacation domain ("Only react to mail coming from domain XYZ"):


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

as user 'root':
# cp kolab_vacation_tool /kolab/sbin/
# chown kolab /kolab/sbin/kolab_vacation_tool
# chmod 744 /kolab/sbin/kolab_vacation_tool

If you have many users you might need to increase the memory available
to PHP scripts in /kolab/etc/php/php.ini, e.g.:

  memory_limit = 32M


Usage
-----

as user 'kolab':
$ kolab_vacation_tool DOMAIN USER_PATTERN...

For selecting users you can use the primary email address or the uid.
Wildcard character is '*'.


Examples
--------

Set vacation domain for selected users to 'example.com':
$ kolab_vacation_tool example.com '*smith*' user at sub.example.com 'foo*'

Set vacation domain for _all_ users to 'sub.example.net':
$ kolab_vacation_tool sub.example.net '*'

Remove vacation domain setting for a selected user:
$ kolab_vacation_tool '' user at sub.example.com




From cvs at intevation.de  Fri Jan 20 15:44:32 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri, 20 Jan 2006 15:44:32 +0100 (CET)
Subject: bernhard: doc/www/src mirrors.html.m4,1.13,1.14 
Message-ID: <20060120144432.D15C91005C6@lists.intevation.de>

Author: bernhard

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

Modified Files:
	mirrors.html.m4 
Log Message:
Linjection has not server release again.


Index: mirrors.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/mirrors.html.m4,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- mirrors.html.m4	11 Jan 2006 15:02:24 -0000	1.13
+++ mirrors.html.m4	20 Jan 2006 14:44:30 -0000	1.14
@@ -13,7 +13,7 @@
   via <a href="http://ftp.belnet.be/packages/kolab/">http</a> |
   <a href="ftp://ftp.belnet.be/packages/kolab/">ftp</a>
 <li>
-  <b>Linjection</b><br> 
+  <b>Linjection</b> (might lack stable server releases)<br> 
   via
   <a href="http://kolab.linjection.org/">http</a>
 </ul>



From cvs at intevation.de  Fri Jan 20 16:10:28 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri, 20 Jan 2006 16:10:28 +0100 (CET)
Subject: bernhard: doc/www/src roadmap.html.m4,1.4,1.5 
Message-ID: <20060120151028.2BCD71005C6@lists.intevation.de>

Author: bernhard

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

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


Index: roadmap.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/roadmap.html.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- roadmap.html.m4	24 Nov 2005 10:27:18 -0000	1.4
+++ roadmap.html.m4	20 Jan 2006 15:10:26 -0000	1.5
@@ -20,22 +20,13 @@
 
 <h2>Kolab Server 2.0 release series</h2>
 
-Current release is: 2.0.1 (September 14th, 2005)
-
-<h3>Upcoming Server release 2.0.2</h3>
-
-Expected: December 2005
-
-<ul>
-<li> critical bug fixes for stability
-</ul>
-
-For more details see the release notes in CVS.
+Current release is: 2.0.3.
 
-<h3>Post Server 2.0.2 releases</h3>
+<h3>Further Server 2.0.x releases</h3>
 
 The maintenance of the 2.0-branch includes security fixes and
-possible upgrades of OpenPKG.
+possible upgrades of OpenPKG if necessary until Server 2.1.x
+are released and offer an upgrade path.
 
 <p>
 Other fixes and some feature improvemtents (perhaps backports from
@@ -45,11 +36,11 @@
 
 This development takes place in HEAD. 
 Sometimes development releases are made
-to help testing the new feature, e.g. development-2.1-20050811.
+to help testing the new feature, e.g. development-2.1-20051215.
 
 <h3>Upcoming Server release 2.1beta1</h3>
 
-Expected: December 2005
+Expected: February 2006
 
 <ul>
 <li> Simple version of multi-email-domain support<br>
@@ -64,7 +55,7 @@
 Actual development has not startet yet.
 
 <p>
-Expected: 2006
+Expected: Start of development Q4 2006
 
 <ul>
 <li> Full multi-email-domain support<br>



From cvs at intevation.de  Fri Jan 20 18:11:52 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri, 20 Jan 2006 18:11:52 +0100 (CET)
Subject: thomas: utils/admin kolab_vacation_tool, 1.1,
	1.2 kolab_vacation_tool.README, 1.1, 1.2 
Message-ID: <20060120171152.78B1C1005AA@lists.intevation.de>

Author: thomas

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

Modified Files:
	kolab_vacation_tool kolab_vacation_tool.README 
Log Message:
Updated to allow setting option "Do not send vacation replies to spam messages"


Index: kolab_vacation_tool
===================================================================
RCS file: /kolabrepository/utils/admin/kolab_vacation_tool,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab_vacation_tool	19 Jan 2006 15:35:18 -0000	1.1
+++ kolab_vacation_tool	20 Jan 2006 17:11:50 -0000	1.2
@@ -1,9 +1,9 @@
 #!/kolab/bin/php
 <?php
-/*
- *  Copyright (c) 2005 Intevation GmbH
+/*  $Id$
+ *  Copyright (c) 2005, 2006 Intevation GmbH
  *
- *    Writen by Thomas Arendsen Hein <thomas at intevation.de>
+ *    Written by Thomas Arendsen Hein <thomas at intevation.de>
  *
  *  This  program is free  software; you can redistribute  it and/or
  *  modify it  under the terms of the GNU  General Public License as
@@ -28,6 +28,38 @@
 
 include_once 'admin/include/Sieve.php';
 
+include ("Console/Getopt.php");
+
+
+function usage ( $ret ) {
+  fwrite(STDOUT, "Usage: kolab_vacation_tool [--domain DOMAIN] [--spam] [--nospam] USERPATTERN...\n\n");
+  fwrite(STDOUT, "  Set vacation parameters for Kolab users matching a given pattern.\n");
+  fwrite(STDOUT, "  Pattern is matched against primary email address and uid.\n");
+  fwrite(STDOUT, "  Wildcard for the pattern is \"*\".\n");
+  fwrite(STDOUT, "\nOptions:\n\n");
+  fwrite(STDOUT, "  --domain DOMAIN   Only react to mail coming from DOMAIN.\n");
+  fwrite(STDOUT, "                    Use an empty string to react to all domains.\n");
+  fwrite(STDOUT, "  --spam            Enable vacation replies to spam messages.\n");
+  fwrite(STDOUT, "  --nospam          Disable vacation replies to spam messages.\n");
+  fwrite(STDOUT, "  -v, --verbose     Increase verbosity.\n");
+  fwrite(STDOUT, "  -q, --quiet       Decrease verbosity.\n");
+  fwrite(STDOUT, "  --help            Show this help message.\n");
+  fwrite(STDOUT, "\nExamples:\n\n");
+  fwrite(STDOUT, "  Set vacation domain for selected users to 'example.com':\n");
+  fwrite(STDOUT, "    kolab_vacation_tool --domain example.com '*smith*' user at sub.example.com\n");
+  fwrite(STDOUT, "  Set vacation domain for _all_ users to 'sub.example.net':\n");
+  fwrite(STDOUT, "    kolab_vacation_tool --domain sub.example.net '*'\n");
+  fwrite(STDOUT, "  Remove vacation domain setting for a selected user:\n");
+  fwrite(STDOUT, "    kolab_vacation_tool --domain '' user at sub.example.com\n");
+  fwrite(STDOUT, "  Enable vacation replies to spam messages for a selected user:\n");
+  fwrite(STDOUT, "    kolab_vacation_tool --spam user at sub.example.com\n");
+  fwrite(STDOUT, "  Disable vacation replies to spam, set vacation domain, list changed values:\n");
+  fwrite(STDOUT, "    kolab_vacation_tool --nospam --domain example.com user at example.com\n");
+  fwrite(STDOUT, "\n");
+  exit($ret);
+}
+
+
 function load_kolab_conf () {
   $kolab_conf = array();
   foreach(file('/kolab/etc/kolab/kolab.conf') as $line) {
@@ -72,7 +104,8 @@
 }
 
 
-function sieve_maildomain ( $auth, $pass, $host, $user, $new_maildomain ) {
+function sieve_update ( $auth, $pass, $host, $user, $verbosity,
+                        $maildomain, $dontreacttospam ) {
   $errors = array();
 
   $scriptname = 'kolab-vacation.siv';
@@ -90,21 +123,32 @@
   }
   if( in_array( $scriptname, $scripts ) ) {
     $script = $sieve->getScript($scriptname);
-    $maildomain = SieveUtils::getMailDomain( $script );
-    $reacttospam = SieveUtils::getReactToSpam( $script );
+    $old_maildomain = SieveUtils::getMailDomain( $script );
+    $old_dontreacttospam = SieveUtils::getReactToSpam( $script );
     $addresses = SieveUtils::getVacationAddresses( $script );
     $days = SieveUtils::getVacationDays( $script );
     $text = SieveUtils::getVacationText( $script );
-  } else $reacttospam = true;
+  } else $old_dontreacttospam = true;
   if( $addresses === false ) $addresses = array( "" );
   $active = ( $sieve->getActive() === $scriptname );
 
-  if( $maildomain != $new_maildomain ) {
+  if(is_null($maildomain))
+    $new_maildomain = $old_maildomain;
+  else
+    $new_maildomain = $maildomain;
 
-    $script = 
+  if(is_null($dontreacttospam))
+    $new_dontreacttospam = $old_dontreacttospam;
+  else
+    $new_dontreacttospam = $dontreacttospam;
+
+  if( $new_maildomain != $old_maildomain ||
+      $new_dontreacttospam != $old_dontreacttospam ) {
+
+    $script =
       "require \"vacation\";\r\n\r\n".
       (!empty($new_maildomain)?"if not address :domain :contains \"From\" \"".$new_maildomain."\" { keep; stop; }\r\n":"").
-      ($reacttospam?"if header :contains \"X-Spam-Flag\" \"YES\" { keep; stop; }\r\n":"").
+      ($new_dontreacttospam?"if header :contains \"X-Spam-Flag\" \"YES\" { keep; stop; }\r\n":"").
       ($addresses && $text && $days ?
       "vacation :addresses [ \"".join('", "', $addresses )."\" ] :days ".$days." text:\r\n".
       SieveUtils::dotstuff($text).".\r\n;":"")."\r\n\r\n";
@@ -116,37 +160,93 @@
       return $errors;
     }
 
-    fwrite(STDOUT, "$user: \"$maildomain\" -> \"$new_maildomain\" on $host\n");
-  } else {
-    fwrite(STDOUT, "$user: already set to \"$new_maildomain\" on $host\n");
+    if ($verbosity == 0) {
+      fwrite(STDOUT, "$user on $host: updated\n");
+    }
+  }
+
+  if ($verbosity > 0) {
+    if(!is_null($maildomain)) {
+      if($new_maildomain != $old_maildomain)
+        fwrite(STDOUT, "$user on $host: domain updated: \"$old_maildomain\" -> \"$new_maildomain\"\n");
+      else
+        fwrite(STDOUT, "$user on $host: domain unchanged: \"$new_maildomain\"\n");
+    }
+    if(!is_null($dontreacttospam)) {
+      if($new_dontreacttospam != $old_dontreacttospam)
+        fwrite(STDOUT, "$user on $host: react to spam: " . ($old_dontreacttospam?"NO -> ":"YES -> "));
+      else
+        fwrite(STDOUT, "$user on $host: react to spam unchanged: ");
+      fwrite(STDOUT, ($new_dontreacttospam?"NO\n":"YES\n"));
+    }
   }
+
 }
 
 
 // main
 
-if( count($argv) < 3 ) {
-  fwrite(STDOUT, "Usage: $argv[0] MAILDOMAIN USERPATTERN...\n");
-  fwrite(STDOUT, "Set vacation parameter \"Only react to mail coming from domain\"\n");
-  fwrite(STDOUT, "for Kolab users matching a given pattern. Wildcard is \"*\".\n");
+$cg = new Console_Getopt();
+$args = $cg->readPHPArgv();
+$ret = $cg->getopt($args, "vq", array("domain=", "spam", "nospam",
+                                      "verbose", "quiet", "help"));
+
+if (PEAR::isError($ret)) {
+  die ("Error in command line: " . $ret->getMessage() . "\n");
+}
+
+$verbosity = 0;
+$maildomain = NULL;
+$dontreacttospam = NULL;
+
+$opts = $ret[0];
+if (sizeof($opts) > 0) {
+  foreach ($opts as $o) {
+    switch ($o[0]) {
+      case '--domain':
+        $maildomain = $o[1];
+        break;
+      case '--spam':
+        $dontreacttospam = false;
+        break;
+      case '--nospam':
+        $dontreacttospam = true;
+        break;
+      case 'q':
+      case '--quiet':
+        $verbosity--;
+        break;
+      case 'v':
+      case '--verbose':
+        $verbosity++;
+        break;
+      case '--help':
+        usage(0);
+        break;
+    }
+  }
+} else {
+  usage(0);
+}
+
+$userpatterns = $ret[1];
+if( count($userpatterns) < 1 ) {
+  fwrite(STDOUT, "You need to specify at least one user pattern.\n\n");
   exit(1);
 }
 
 $kolab_conf = load_kolab_conf();
 
-$argv = $_SERVER['argv'];
-unset($argv[0]);
-$new_maildomain = $argv[1];
-unset($argv[1]);
-
-$users = user_homeserver($kolab_conf, $argv);
+$users = user_homeserver($kolab_conf, $userpatterns);
 if( count($users) < 1 ) {
   fwrite(STDOUT, "No matching users found.\n");
   exit(0);
 }
 
 foreach($users as $user => $homeserver) {
-  $errors = sieve_maildomain ( $kolab_conf['manager'], $kolab_conf['bind_pw'], $homeserver, $user, $new_maildomain );
+  $errors = sieve_update ( $kolab_conf['manager'], $kolab_conf['bind_pw'],
+                           $homeserver, $user, $verbosity,
+                           $maildomain, $dontreacttospam );
   if( $errors ) {
     fwrite(STDOUT, "Error while setting vacation maildomain for user ".$user.":\n");
     foreach($errors as $line) {

Index: kolab_vacation_tool.README
===================================================================
RCS file: /kolabrepository/utils/admin/kolab_vacation_tool.README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab_vacation_tool.README	19 Jan 2006 15:35:18 -0000	1.1
+++ kolab_vacation_tool.README	20 Jan 2006 17:11:50 -0000	1.2
@@ -1,13 +1,13 @@
 kolab_vacation_tool
 ===================
 
-Update vacation domain ("Only react to mail coming from domain XYZ"):
+Set vacation parameters for Kolab users.
 
 
 Installation
 ------------
 
-as user 'root':
+as user 'root' on the kolab server (master or slave):
 # cp kolab_vacation_tool /kolab/sbin/
 # chown kolab /kolab/sbin/kolab_vacation_tool
 # chmod 744 /kolab/sbin/kolab_vacation_tool
@@ -21,22 +21,9 @@
 Usage
 -----
 
-as user 'kolab':
-$ kolab_vacation_tool DOMAIN USER_PATTERN...
-
-For selecting users you can use the primary email address or the uid.
-Wildcard character is '*'.
-
-
-Examples
---------
+As user 'kolab' run:
+$ kolab_vacation_tool --help
 
-Set vacation domain for selected users to 'example.com':
-$ kolab_vacation_tool example.com '*smith*' user at sub.example.com 'foo*'
 
-Set vacation domain for _all_ users to 'sub.example.net':
-$ kolab_vacation_tool sub.example.net '*'
-
-Remove vacation domain setting for a selected user:
-$ kolab_vacation_tool '' user at sub.example.com
 
+$Id$



From cvs at intevation.de  Mon Jan 23 22:30:08 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon, 23 Jan 2006 22:30:08 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf suse,1.27,1.28 
Message-ID: <20060123213008.EC4F11005A8@lists.intevation.de>

Author: richard

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

Modified Files:
	suse 
Log Message:
sorted the files to be backed up alphabetically added some additional ones

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- suse	18 Jan 2006 19:54:43 -0000	1.27
+++ suse	23 Jan 2006 21:30:06 -0000	1.28
@@ -154,14 +154,17 @@
 # One time backup files.  These original distribution configuration files
 # will be backed up once, just before kolab is about to change those files.
 backupfiles=/etc/amavisd.conf \
-	/etc/php.ini \
+	/etc/clamd.conf \
 	/etc/cyrus.conf \
 	/etc/imapd.conf \
+	/etc/freshclam.conf \
+	/etc/openldap/ldap.conf \
 	/etc/openldap/slapd.conf \
+	/etc/php.ini \
 	/etc/postfix/main.cf \
 	/etc/postfix/master.cf \
-	/usr/lib/sasl2/smtpd.conf \
 	/etc/postfix/transport \
 	/etc/postfix/virtual \
 	/etc/sysconfig/ldap \
 	/etc/sysconfig/saslauthd
+	/usr/lib/sasl2/smtpd.conf \



From cvs at intevation.de  Mon Jan 23 22:38:25 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon, 23 Jan 2006 22:38:25 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog, 1.53, 1.54 kolabquotawarn.in,
	1.7, 1.8 
Message-ID: <20060123213825.5E2B81005A8@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog kolabquotawarn.in 
Log Message:
removed \n in error string, seems redundant



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- ChangeLog	18 Jan 2006 19:54:43 -0000	1.53
+++ ChangeLog	23 Jan 2006 21:38:23 -0000	1.54
@@ -1,3 +1,6 @@
+2006-01-23 Richard Bos <richard at radoeka.nl>
+	* kolabquotawarn.in: removed \n in error string, seems redundant.
+
 2006-01-18 Richard Bos <richard at radoeka.nl>
 	* dist_conf/suser: add /etc/php.ini to the backup list.
 

Index: kolabquotawarn.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabquotawarn.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- kolabquotawarn.in	11 Jan 2006 20:31:38 -0000	1.7
+++ kolabquotawarn.in	23 Jan 2006 21:38:23 -0000	1.8
@@ -192,7 +192,7 @@
 
 ### Connect to Cyrus
 my $cyrus = Cyrus::IMAP::Admin->new('localhost');
-$cyrus || fatal_exit( 'Unable to connect to local Cyrus admin interface\n' );
+$cyrus || fatal_exit( 'Unable to connect to local Cyrus admin interface' );
 $cyrus->authenticate(
 					 'User'          => $Kolab::config{'cyrus_admin'},
 					 'Password'      => $Kolab::config{'cyrus_admin_pw'},



From cvs at intevation.de  Tue Jan 24 11:36:42 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 24 Jan 2006 11:36:42 +0100 (CET)
Subject: wilde: utils/admin save-annotations.sh,NONE,1.1 
Message-ID: <20060124103642.1BCDD1005C1@lists.intevation.de>

Author: wilde

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

Added Files:
	save-annotations.sh 
Log Message:
Added some more explanations to the comments for BACKUP_DIR and USER.


--- NEW FILE: save-annotations.sh ---
#!/bin/bash

# -------------------------------------------------------------------
# Copyright (C) 2006 by Intevation GmbH
# Author(s):
# Sascha Wilde <wilde at intevation.de>

# This program is free software under the GNU GPL (>=v2)
# Read the file COPYING coming with the software for details.
# -------------------------------------------------------------------
# $Id: save-annotations.sh,v 1.1 2006/01/24 10:36:39 wilde Exp $

# Description:

# Backup and check annotations db.

# As the kolab/cyrus-imap annotations.db tends to break on a regular
# basis, this script should be setup as a cronjob.

# This script:
# - backups the annotations.db
# - checks if the backup file is a valid skiplist db
# - informs the admin if it isn't
# - removes old backups if everything worked fine

# -------------------------------------------------------------------

# These variables shall be configured:

# Error-reports will be send to this address:
ADMIN_MAIL=root at localhost

# Error-reports will have this from address:
ERROR_SENDER=postmaster@`hostname -f`

# Path to annotations.db:
ANNOTATIONSDB=/kolab/var/imapd/annotations.db

# Directory of the backups:
# This must be writeable for $USER (see below)
BACKUP_DIR=/tmp/backuptest/

# Keep backup files for N days:
BACKUP_LIVESPAN=7

# Run this script as user:
# The user must be able to read $ANNOTATIONSDB and to write to $BACKUP_DIR
USER=kolab-r

# Used Binaries:
CVT_CYRUSDB=/kolab/bin/cvt_cyrusdb

# Command used:
# - to copy annotations.db to backup
COPY="/usr/bin/rsync"
# - to compress file, for no compression leave empty
COMPRESS="/bin/gzip -9"

# sendmail used to send error-reports
# THIS HAS TO BE CORRECT OR ANY ERROR-REPORTING WILL FAIL!!!
SENDMAIL=/kolab/sbin/sendmail

# -------------------------------------------------------------------
# Nothing to configure past this point...

BACKUP_FILE="${BACKUP_DIR}/annotations.db-`date +%Y%m%d-%H:%M:%S`"

# Change identity if necessary
if [ `whoami` != "$USER" ] ; then
  if [ $UID -eq 0 ] ; then
    exec su -p - $USER "$0"
  else
    echo >&2 "$0 must be run as $USER or root!"
    exit 1
  fi
fi

# Error handling functions:
reporterr()
{
  $SENDMAIL $ADMIN_MAIL \
    <<EOF 
From: Save Annotations Script <${ERROR_SENDER}>
To: <${ADMIN_MAIL}>
Subject: Save Annotations Error
X-Save-Annotations-Error: generated on $HOSTNAME

$0 reported error:
$1
EOF
}

fatal()
{
  reporterr "$1"
  exit 1
}

# Worker functions:
backup-annotations()
{
  [ -d "$BACKUP_DIR" ] || mkdir -p "$BACKUP_DIR"
  $COPY >/dev/null 2>&1 "$ANNOTATIONSDB" "$BACKUP_FILE" || \
    fatal "FATAL: \"$COPY $ANNOTATIONSDB $BACKUP_FILE\" failed with returncode $?"
}

check-backup()
{
  temp_file="${BACKUP_DIR}/.tempflatdb"
  # beware this takes a few seconds!
  $CVT_CYRUSDB "$BACKUP_FILE" skiplist \
    "$temp_file" flat >/dev/null 2>&1 && \
    rm $temp_file
}

compress-backup()
{
  if [ "$COMPRESS" ] ; then
    $COMPRESS >/dev/null 2>&1 "$BACKUP_FILE" || \
      reporterr "Compression failed: \"$COMPRESS $BACKUP_FILE\" returened $?"
  fi
}

expunge-old-backups()
{
  find "$BACKUP_DIR" -type f \! -mtime -$BACKUP_LIVESPAN \
    -exec rm \{\} \;
}

# -------------------------------------------------------------------
# Main routine:

if [ -f "$ANNOTATIONSDB" ] ; then
  backup-annotations
  check-backup
  check_success=$?
  if [ ! $check_success -eq 0 ] ; then
    reporterr "BROKEN DB: check of $BACKUP_FILE failed.  
Kolab most likely stoped working!"
    mv "$BACKUP_FILE" "${BACKUP_FILE}_CORRUPT"
    BACKUP_FILE="${BACKUP_FILE}_CORRUPT"
  fi
  compress-backup
  [ $check_success -eq 0 ] && \
    expunge-old-backups
else
  fatal "FATAL: File \"$ANNOTATIONSDB\" does not exist."
fi



From cvs at intevation.de  Tue Jan 24 12:02:11 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 24 Jan 2006 12:02:11 +0100 (CET)
Subject: wilde: utils/admin save-annotations.README,NONE,1.1 
Message-ID: <20060124110211.CF21110015B@lists.intevation.de>

Author: wilde

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

Added Files:
	save-annotations.README 
Log Message:
Short documentation for save-annotations.sh


--- NEW FILE: save-annotations.README ---
save-annotations
================

Backup annotations.db and check if it's broken.

The cyrus imap annotations.db is known to get corrupted easily and
hard to be recovered. <https://intevation.de/roundup/kolab/issue840>
Therefor this script can be installed on an kolab-server as a cronjob
to backup the annotations.db and warn the administrator if the current
annotations.db is broken.

The warning will be sent by email, so make sure you can read your
mails even when the kolab-server fails!


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

- Edit save-annotations.sh: read the comments and set the variables on
  the top of the script to meaningful values.  Most defaults should be
  sensible for a standard kolab installation.

- Make save-annotations.sh executable:
  chmod 755 save-annotations.sh

- Copy (as root) save-annotations.sh anywhere you like, eg:
  cp save-annotations.sh /kolab/sbin

- Make an entry in /etc/crontab to run save-annotations.sh on an
  regular basis.  If the last working update is not up to date
  recovering the lost information will be difficult and painful, so
  more often is better.
  This example runs save-annotations every hour:
  0 * * * *   kolab-r /kolab/sbin/save-annotations.sh

Now: read your mails, and if the annotations.db gets corrupted put the
last working backup in place:
zcat PATH/TO/BACKUP/annotations.db-20060124-08:01:01.gz >/kolab/var/imapd/annotations.db



From cvs at intevation.de  Tue Jan 24 20:16:04 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 24 Jan 2006 20:16:04 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf suse,1.28,1.29 
Message-ID: <20060124191604.857671005C8@lists.intevation.de>

Author: richard

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

Modified Files:
	suse 
Log Message:
fix typo

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- suse	23 Jan 2006 21:30:06 -0000	1.28
+++ suse	24 Jan 2006 19:16:02 -0000	1.29
@@ -166,5 +166,5 @@
 	/etc/postfix/transport \
 	/etc/postfix/virtual \
 	/etc/sysconfig/ldap \
-	/etc/sysconfig/saslauthd
-	/usr/lib/sasl2/smtpd.conf \
+	/etc/sysconfig/saslauthd \
+	/usr/lib/sasl2/smtpd.conf



From cvs at intevation.de  Wed Jan 25 00:37:44 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 25 Jan 2006 00:37:44 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf suse,1.29,1.30 
Message-ID: <20060124233744.AC7F51006BA@lists.intevation.de>

Author: richard

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

Modified Files:
	suse 
Log Message:
clamd adjustments for suse

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- suse	24 Jan 2006 19:16:02 -0000	1.29
+++ suse	24 Jan 2006 23:37:42 -0000	1.30
@@ -37,10 +37,10 @@
 sysrundir=${localstatedir}/run
 
 clamav_confdir=${sysconfdir}
-clamav_socket=${localstatedir}/clamav/clamd.sock
+clamav_socket=/var/lib/clamav/clamd-socket
 clamav_logfile=${localstatedir}/log/clamav
-clamav_pidfile=${sysrundir}/clamd.pid
-clamav_datadir=${datadir}/clamav
+clamav_pidfile=/var/lib/clamav/clamd.pid
+clamav_datadir=/var/lib/clamav
 freshclam_logfile=${localstatedir}/log/freshclam.log
 freshclam_pidfile=${sysrundir}/freshclam.pid
 clamav_rusr=vscan



From cvs at intevation.de  Wed Jan 25 22:55:24 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 25 Jan 2006 22:55:24 +0100 (CET)
Subject: richard: server/kolabd/kolabd/doc README.webgui.in,1.3,1.4 
Message-ID: <20060125215524.CB5011005C8@lists.intevation.de>

Author: richard

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

Modified Files:
	README.webgui.in 
Log Message:
Fix typo

Index: README.webgui.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/doc/README.webgui.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- README.webgui.in	15 Jan 2006 20:50:31 -0000	1.3
+++ README.webgui.in	25 Jan 2006 21:55:22 -0000	1.4
@@ -34,7 +34,7 @@
 
 
 2) Controlling access for regular users to the LDAP attributes of the
-user's account object. If it possible to change which LDAP attributes
+user's account object. It it possible to change which LDAP attributes
 are shown to users on the user page. For each attribute in the user
 form, an entry in the array $params['attribute_access'] in
 @sysconfdir@/kolab/templates/session_vars.php can be made. The key



From cvs at intevation.de  Thu Jan 26 19:02:22 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu, 26 Jan 2006 19:02:22 +0100 (CET)
Subject: bh: doc/kde-client/svn-instructions checkout_proko2.sh,1.12,1.13 
Message-ID: <20060126180222.A890A1005B7@lists.intevation.de>

Author: bh

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

Modified Files:
	checkout_proko2.sh 
Log Message:
Apply an update from Till Adam


Index: checkout_proko2.sh
===================================================================
RCS file: /kolabrepository/doc/kde-client/svn-instructions/checkout_proko2.sh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- checkout_proko2.sh	28 Dec 2005 16:39:46 -0000	1.12
+++ checkout_proko2.sh	26 Jan 2006 18:02:20 -0000	1.13
@@ -57,6 +57,13 @@
   ( cd $dir && $SVN $USERNAMEOPT switch "$SVNPROTOCOL://$SVNUSERAT$SVNSERVER/home/kde/branches/kdepim/proko2/kdepim/$dir/$file" $file )
 }
 
+function checkout_dir() {
+  echo "checking out $1 ..."
+  file=`basename $1`
+  dir=`dirname $1`
+  ( cd $dir && $SVN $USERNAMEOPT checkout "$SVNPROTOCOL://$SVNUSERAT$SVNSERVER/home/kde/branches/kdepim/proko2/kdepim/$dir/$file" $file )
+}
+
 switch_dir certmanager/lib
 switch_dir kmail
 switch_dir korganizer
@@ -82,9 +89,17 @@
      kaddressbook/features/resourceselection.{cpp,h} \
      certmanager/{aboutdata.cpp,certificatewizard{.ui,impl.cpp},lib/backends/qgpgme/qgpgmejob.cpp} \
      libkdenetwork/Makefile.am \
-     wizards/{Makefile.am,kolabwizard.cpp,kolabwizard.h,kmailchanges.cpp,kolab.kcfg}
+     wizards/{Makefile.am,kolabwizard.cpp,kolabwizard.h,kmailchanges.cpp,kolab.kcfg} \
+     kioslaves/Makefile.am
  do
  switch_file $f
+done
+
+for f in \
+    kioslaves/ldap \
+    libpimldaptools
+  do
+  checkout_dir $f
 done
 
 ### How to finish the branching of a dir where some files were branched:



From cvs at intevation.de  Fri Jan 27 21:13:43 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri, 27 Jan 2006 21:13:43 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf suse,1.30,1.31 
Message-ID: <20060127201343.BC0301005BB@lists.intevation.de>

Author: richard

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

Modified Files:
	suse 
Log Message:
suse adaptions

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- suse	24 Jan 2006 23:37:42 -0000	1.30
+++ suse	27 Jan 2006 20:13:41 -0000	1.31
@@ -26,7 +26,7 @@
 amavisd_conffile=${sysconfdir}/amavisd.conf
 amavisd_templatedir=${sysconfdir}/amavisd/templates.d
 amavisd_logfile=${localstatedir}/log/amavisd
-amavisd_home=${localstatedir}/amavisd
+amavisd_home=${localstatedir}/spool/amavis
 amavisd_rusr=vscan
 amavisd_usr=root
 amavisd_grp=root
@@ -133,7 +133,7 @@
 phppeardir=${phplibdir}/PEAR
 
 sasl_smtpconffile=${libdir}/sasl2/smtpd.conf
-sasl_authdconffile=${libdir}/sasl2/authd.conf
+sasl_authdconffile=${sysconfdir}/saslauthd.conf
 sasl_logfile=${localstatedir}/log/saslauthd.log
 
 resmgr_logfile=${localstatedir}/log/resmgr.log
@@ -165,6 +165,7 @@
 	/etc/postfix/master.cf \
 	/etc/postfix/transport \
 	/etc/postfix/virtual \
+	/etc/saslauthd.conf \
 	/etc/sysconfig/ldap \
 	/etc/sysconfig/saslauthd \
 	/usr/lib/sasl2/smtpd.conf



From cvs at intevation.de  Fri Jan 27 21:38:00 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri, 27 Jan 2006 21:38:00 +0100 (CET)
Subject: bh: doc/kde-client/svn-instructions checkout_proko2.sh,1.13,1.14 
Message-ID: <20060127203800.C91391005BD@lists.intevation.de>

Author: bh

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

Modified Files:
	checkout_proko2.sh 
Log Message:
Patch from Till Adam


Index: checkout_proko2.sh
===================================================================
RCS file: /kolabrepository/doc/kde-client/svn-instructions/checkout_proko2.sh,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- checkout_proko2.sh	26 Jan 2006 18:02:20 -0000	1.13
+++ checkout_proko2.sh	27 Jan 2006 20:37:58 -0000	1.14
@@ -81,6 +81,7 @@
 switch_dir plugins
 
 for f in \
+     Makefile.am.in \
      kaddressbook/{kabcore.cpp,kabcore.h,kaddressbook_part.rc} \
      kaddressbook/{searchmanager.{cpp,h},extensionmanager.{cpp,h}} \
      kaddressbook/kaddressbookui.rc \



From cvs at intevation.de  Sat Jan 28 19:22:02 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat, 28 Jan 2006 19:22:02 +0100 (CET)
Subject: thomas: doc/www/src index.html.m4,1.74,1.75 
Message-ID: <20060128182202.EA73E100161@lists.intevation.de>

Author: thomas

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

Modified Files:
	index.html.m4 
Log Message:
Corrected year in news item.


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- index.html.m4	13 Jan 2006 19:37:08 -0000	1.74
+++ index.html.m4	28 Jan 2006 18:22:00 -0000	1.75
@@ -46,7 +46,7 @@
 <!-- BEGIN LATEST BLOCK --> <div class="latestnews">
 
 <table>
-<tr><td class="newsd">January 13th, 2005</td>
+<tr><td class="newsd">January 13th, 2006</td>
 <td class="newsh">&raquo;
 	Security Advisory 08 for Kolab Server
 </td></tr>



From cvs at intevation.de  Tue Jan 31 23:00:18 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 31 Jan 2006 23:00:18 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf kolabsrv.in,1.3,1.4 
Message-ID: <20060131220018.609F11005A8@lists.intevation.de>

Author: richard

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

Modified Files:
	kolabsrv.in 
Log Message:
add freshclam to the services list

Index: kolabsrv.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolabsrv.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolabsrv.in	6 Jan 2006 20:37:43 -0000	1.3
+++ kolabsrv.in	31 Jan 2006 22:00:16 -0000	1.4
@@ -38,7 +38,7 @@
 esac
 
 if [[ "$2" == "all" ]]; then
-	SERVICES="@LDAPD@ saslauthd spamd amavis apache2 clamd cyrus postfix"
+	SERVICES="@LDAPD@ saslauthd spamd amavis apache2 freshclam clamd cyrus postfix"
 	# SERVICES="$SERVICES kolab"
 else
 	SERVICES=$2



From cvs at intevation.de  Tue Jan 31 23:20:18 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 31 Jan 2006 23:20:18 +0100 (CET)
Subject: richard: server/kolabd/kolabd/templates
	kolab_smtpdpolicy.conf.template.in, 1.2, 1.3 
Message-ID: <20060131222018.1F1FB1005CA@lists.intevation.de>

Author: richard

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

Modified Files:
	kolab_smtpdpolicy.conf.template.in 
Log Message:
Added kolab_smtpdpolicy_conffile_usr and
kolab_smtpdpolicy_conffile_grp variables.



Index: kolab_smtpdpolicy.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/kolab_smtpdpolicy.conf.template.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolab_smtpdpolicy.conf.template.in	3 Oct 2005 01:07:55 -0000	1.2
+++ kolab_smtpdpolicy.conf.template.in	31 Jan 2006 22:20:16 -0000	1.3
@@ -1,7 +1,7 @@
 KOLAB_META_START
 TARGET=@sysconfdir@/kolab/kolab_smtpdpolicy.conf
 PERMISSIONS=0640
-OWNERSHIP=@kolab_musr@:@kolab_grp@
+OWNERSHIP=@kolab_smtpdpolicy_conffile_usr@:@kolab_smtpdpolicy_conffile_grp@
 KOLAB_META_END
 # (c) 2005 Steffen Hansen <steffen at klaralvdalens-datakonsult.se> (Klaralvdalens Datakonsult AB)
 #



From cvs at intevation.de  Tue Jan 31 23:20:18 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 31 Jan 2006 23:20:18 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf common, 1.19, 1.20 kolab, 1.24,
	1.25 suse, 1.31, 1.32 
Message-ID: <20060131222018.0F42C1005C3@lists.intevation.de>

Author: richard

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

Modified Files:
	common kolab suse 
Log Message:
Added kolab_smtpdpolicy_conffile_usr and
kolab_smtpdpolicy_conffile_grp variables.



Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- common	18 Jan 2006 19:43:11 -0000	1.19
+++ common	31 Jan 2006 22:20:15 -0000	1.20
@@ -90,6 +90,8 @@
 	-e 's,[@]kolab_rpm[@],$(kolab_rpm),g' \
 	-e 's,[@]kolab_rusr[@],$(kolab_rusr),g' \
 	-e 's,[@]kolab_statedir[@],$(kolab_statedir),g' \
+	-e 's,[@]kolab_smtpdpolicy_conffile_grp[@],$(kolab_smtpdpolicy_conffile_grp),g' \
+	-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' \

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- kolab	18 Jan 2006 19:54:43 -0000	1.24
+++ kolab	31 Jan 2006 22:20:15 -0000	1.25
@@ -114,6 +114,8 @@
 kolab_resource_handlers_rpm=kolab-resource-handlers
 kolab_webadmin_rpm=kolab-webadmin
 perl_kolab_rpm=perl-kolab
+kolab_smtpdpolicy_conffile_usr=${kolab_musr}
+kolab_smtpdpolicy_conffile_grp=${kolab_grp}
 
 ldapserver_statedir=${localstatedir}/openldap
 ldapserver_dir=${ldapserver_statedir}/openldap-data

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- suse	27 Jan 2006 20:13:41 -0000	1.31
+++ suse	31 Jan 2006 22:20:15 -0000	1.32
@@ -94,6 +94,8 @@
 kolab_resource_handlers_rpm=kolab-resource-handlers
 kolab_webadmin_rpm=kolab-webadmin
 perl_kolab_rpm=perl-kolab
+kolab_smtpdpolicy_conffile_usr=root
+kolab_smtpdpolicy_conffile_grp=nobody
 
 ldapserver_statedir=${localstatedir}/lib/ldap
 ldapserver_dir=${localstatedir}/lib/ldap



From cvs at intevation.de  Tue Jan 31 23:24:18 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 31 Jan 2006 23:24:18 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf suse,1.32,1.33 
Message-ID: <20060131222418.C21501005B0@lists.intevation.de>

Author: richard

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

Modified Files:
	suse 
Log Message:
store resmgr confi dir inside /etc/kolab

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- suse	31 Jan 2006 22:20:15 -0000	1.32
+++ suse	31 Jan 2006 22:24:16 -0000	1.33
@@ -139,7 +139,7 @@
 sasl_logfile=${localstatedir}/log/saslauthd.log
 
 resmgr_logfile=${localstatedir}/log/resmgr.log
-resmgr_confdir=${sysconfdir}/resmgr
+resmgr_confdir=${sysconfdir}/kolab/resmgr
 resmgr_filterdir=${localstatedir}/resmgr/filter
 resmgr_usr=root
 resmgr_grp=root



From cvs at intevation.de  Wed Feb  1 16:03:21 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed,  1 Feb 2006 16:03:21 +0100 (CET)
Subject: bh: server obmtool.conf,1.213,1.214 
Message-ID: <20060201150321.6FD9B1005CD@lists.intevation.de>

Author: bh

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

Modified Files:
	obmtool.conf 
Log Message:
Update version numbers.  This change uses openpkg 2.5.1 again.
This also reverts php-smarty to 2.6.3-20040702 because that's what will
be in the next release.  We can go back to the newer one afterwards


Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -d -r1.213 -r1.214
--- obmtool.conf	11 Jan 2006 22:45:22 -0000	1.213
+++ obmtool.conf	1 Feb 2006 15:03:19 -0000	1.214
@@ -45,7 +45,7 @@
     fi
 
     # start from scratch or upgrade within 2.0.x
-    @install ${loc}openpkg-2.5.0-2.5.0 \
+    @install ${loc}openpkg-2.5.1-2.5.1 \
         --tag="kolab" \
         --prefix="${PREFIX}" \
         --user="${CMD}" --group="${CMD}" \
@@ -144,12 +144,12 @@
 	--with=dom \
 	--with=ssl \
 	--with=mbstring
-    @install ${altloc}php-smarty-2.6.10-20051003
+    @install ${altloc}php-smarty-2.6.3-20040702
     @install ${loc}gmp-4.1.4-2.5.0
     @install ${loc}spamassassin-3.1.0-2.5.0
     @install ${plusloc}amavisd-2.3.3-2.5.0
     @install ${loc}curl-7.15.0-2.5.1
-    @install ${altloc}clamav-0.87.1-20051123
+    @install ${altloc}clamav-0.88-20060110
 #    @install ${loc}vim-6.3.78-2.4.0
 #    @install ${plusloc}dcron-2.9-2.4.0
     @install ${altloc}perl-kolab-5.8.7-20051220



From cvs at intevation.de  Wed Feb  1 16:08:33 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed,  1 Feb 2006 16:08:33 +0100 (CET)
Subject: bh: server obmtool.conf,1.214,1.215 
Message-ID: <20060201150833.AF12710015B@lists.intevation.de>

Author: bh

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

Modified Files:
	obmtool.conf 
Log Message:
Same change as in rev. 1.174.2.24:

Do not force registration of the OpenPKG instance.

The openpkg-registry RPM is still installed, though, for the convenience
of users who want to register because they e.g. need additional openpkg
packages.

Also, add ${loc} so that the openpkg-registry RPM is not always
downloaded.


Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -d -r1.214 -r1.215
--- obmtool.conf	1 Feb 2006 15:03:19 -0000	1.214
+++ obmtool.conf	1 Feb 2006 15:08:31 -0000	1.215
@@ -21,10 +21,6 @@
         --url) URL="$arg";;
         esac
     done
-    if test -z "$USERNAME" ; then
-        echo "OpenPKG requires a username for registration. Please supply one with the --user=<username> option at the end of the commandline."
-        exit 1
-    fi
 
 %kolab
     echo "---- boot/build ${NODE} %${CMD} ----"
@@ -52,10 +48,7 @@
         --muid="19414" --ruid="19415" --nuid="19416" \
         --mgid="19414" --rgid="19415" --ngid="19416"
 
-    @install openpkg-registry-0.2.5-20051129
-    $PREFIX/bin/openpkg register --mode=post --user=$USERNAME
-    $PREFIX/bin/openpkg register --printstatus && echo "Please associate the instance now. Then RETURN to continue." && read DUMMY
-
+    @install ${loc}openpkg-registry-0.2.5-20051129
     @install ${loc}make-3.80-2.5.0
     @install ${loc}binutils-2.16.1-2.5.0
     @install ${loc}gcc-4.0.2-2.5.0



From cvs at intevation.de  Wed Feb  1 16:44:06 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed,  1 Feb 2006 16:44:06 +0100 (CET)
Subject: thomas: server release-notes.txt,1.28,1.29 
Message-ID: <20060201154406.13FBF1005CD@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Updated package list with version numbers, improved grouping, details for clamav.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- release-notes.txt	1 Feb 2006 14:28:29 -0000	1.28
+++ release-notes.txt	1 Feb 2006 15:44:04 -0000	1.29
@@ -3,7 +3,7 @@
 
 This is a development snapshot of the kolab server leading up to a 2.1
 release.  For upgrading and installation instructions, please refer to
-the 1st.README file in the source directory.  
+the 1st.README file in the source directory.
 
 At this point an upgrade from 2.0 is not recommended.  Instructions for
 the upgrade from 2.0 are in 1st.README, but they're not very well tested
@@ -19,39 +19,61 @@
       manage settings for a subset of the mail domains of the kolab
       server.
 
+
+Known issues:
+
+      - ...
+
+
 Changes since 2.1-20051215:
 
-    - kolabd 2.0.99-20051215
+    OpenPKG updates:
 
-      More distconf changes by Richard Bos and Markus Hüwe
+      - clamav-0.88-20060110
 
-      webserver prefix
+	Fixes UPX compressed file heap buffer overflow (CVE-2006-0162)
 
-      * Patches:
-	   Issue1046 (fix an openpkg rc call in kolab_bootstrap)
-	   Issue1038 (remove perl-kolab/configure from repository)
-	   Issue1050 (Make DLs work for sending email)
-	   Issue1058 (Adding support for tar target)
-	   Issue1068 (mailboxes not created until kolabd restart)
+	Details:
+	  http://www.clamav.net/doc/0.88/ChangeLog
+	  http://www.securityfocus.com/bid/16191
 
-    - kolab-webadmin 2.0.99-20051213
+      - openpkg-registry-0.2.5-20051129
 
-      More distconf changes by Richard Bos and Markus Hüwe
+	New package
 
-      * Fixing:
-           Issue1023 (fix some typos in messages)
 
-    - kolab-resource-handlers
+    Kolab updates:
 
-      More distconf changes by Richard Bos and Markus Hüwe
+      All kolab specific packages contain more distconf changes
+      by Richard Bos and Markus Hüwe.
 
-      * Fixing:
-	   Issue973  (change from-rewriting to look better in kontact)
-	   Issue1042 (dot-escaping bug)
+      The webserver prefix is configurable now.
 
-    - perl-kolab
+      - kolab-horde-fbview-2.0.99-20051220
 
-      More distconf changes by Richard Bos and Markus Hüwe
+      - kolab-horde-framework-2.0.99-20051220
+
+      - kolab-resource-handlers-2.0.99-20051220
+
+	* Resolved:
+	    Issue973  (change from-rewriting to look better in kontact)
+	    Issue1042 (dot-escaping bug)
+
+      - kolab-webadmin-2.0.99-20051220
+
+	* Resolved:
+	     Issue1023 (fix some typos in messages)
+
+      - kolabd-2.0.99-20051220
+
+	* Resolved:
+	     Issue1046 (fix an openpkg rc call in kolab_bootstrap)
+	     Issue1038 (remove perl-kolab/configure from repository)
+	     Issue1050 (Make DLs work for sending email)
+	     Issue1058 (Adding support for tar target)
+	     Issue1068 (mailboxes not created until kolabd restart)
+
+      - perl-kolab-5.8.7-20051220
 
 
 $Id$



From cvs at intevation.de  Wed Feb  1 17:54:18 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed,  1 Feb 2006 17:54:18 +0100 (CET)
Subject: thomas: server release-notes.txt,1.29,1.30 
Message-ID: <20060201165418.C3B391005C6@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Mention known problems (Issue1068 and Issue1098)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- release-notes.txt	1 Feb 2006 15:44:04 -0000	1.29
+++ release-notes.txt	1 Feb 2006 16:54:16 -0000	1.30
@@ -20,9 +20,12 @@
       server.
 
 
-Known issues:
+Known problems:
 
-      - ...
+      - After bootstrapping please stop kolab and start it again, see
+	Issue1068 (Mailboxes are not created until kolabd restart) and
+	Issue1098 (Changes in the service tab are not accepted after
+	bootstrap) for details.
 
 
 Changes since 2.1-20051215:



From cvs at intevation.de  Wed Feb  1 18:08:01 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed,  1 Feb 2006 18:08:01 +0100 (CET)
Subject: bh: server README.1st,1.32,1.33 
Message-ID: <20060201170801.E2185100161@lists.intevation.de>

Author: bh

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

Modified Files:
	README.1st 
Log Message:
The --user option of obmtool will not be required in the actual release


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- README.1st	21 Dec 2005 01:32:36 -0000	1.32
+++ README.1st	1 Feb 2006 17:07:59 -0000	1.33
@@ -27,7 +27,7 @@
 directory containing this file (1st.README) to some local directory,
 then as root, chdir into that local directory and run
 
-# ./obmtool kolab --user=your at email.address 2>&1 | tee kolab-build.log
+# ./obmtool kolab 2>&1 | tee kolab-build.log
 
 to build and install packages in /kolab.
 By default, the Kolab Server will now be started at boottime.
@@ -50,7 +50,7 @@
 The installation of the new packages works just as for the initial
 installation.  Download the files as described above and run
 
-# ./obmtool kolab --user=your at email.address
+# ./obmtool kolab
 
 obmtool will usually automatically determine which packages need to be
 built.  If you have made changes to the configuration files in



From cvs at intevation.de  Wed Feb  1 18:44:36 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed,  1 Feb 2006 18:44:36 +0100 (CET)
Subject: bh: server obmtool.conf,1.215,1.216 
Message-ID: <20060201174436.19B0E1005A8@lists.intevation.de>

Author: bh

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

Modified Files:
	obmtool.conf 
Log Message:
new versions of some kolab specific packages.


Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -d -r1.215 -r1.216
--- obmtool.conf	1 Feb 2006 15:08:31 -0000	1.215
+++ obmtool.conf	1 Feb 2006 17:44:34 -0000	1.216
@@ -24,7 +24,7 @@
 
 %kolab
     echo "---- boot/build ${NODE} %${CMD} ----"
-    kolab_version="pre-2.1-snapshot-20051218";
+    kolab_version="pre-2.1-snapshot-20060201";
     PREFIX=/${CMD};
     loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
     plusloc='+'
@@ -145,11 +145,11 @@
     @install ${altloc}clamav-0.88-20060110
 #    @install ${loc}vim-6.3.78-2.4.0
 #    @install ${plusloc}dcron-2.9-2.4.0
-    @install ${altloc}perl-kolab-5.8.7-20051220
-    @install ${altloc}kolabd-2.0.99-20051220 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-webadmin-2.0.99-20051220 --define kolab_version=$kolab_version
+    @install ${altloc}perl-kolab-5.8.7-20060201
+    @install ${altloc}kolabd-2.0.99-20060201 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-webadmin-2.0.99-20060201 --define kolab_version=$kolab_version
 	@install ${altloc}kolab-horde-framework-2.0.99-20051220 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-resource-handlers-2.0.99-20051220 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-resource-handlers-2.0.99-20060201 --define kolab_version=$kolab_version
     @install ${altloc}kolab-horde-fbview-2.0.99-20051220 --define kolab_version=$kolab_version
     @check
 



From cvs at intevation.de  Wed Feb  1 19:34:43 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed,  1 Feb 2006 19:34:43 +0100 (CET)
Subject: thomas: server release-notes.txt,1.30,1.31 
Message-ID: <20060201183443.B78A11005AA@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
new versions of some kolab specific packages.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- release-notes.txt	1 Feb 2006 16:54:16 -0000	1.30
+++ release-notes.txt	1 Feb 2006 18:34:41 -0000	1.31
@@ -56,18 +56,18 @@
 
       - kolab-horde-framework-2.0.99-20051220
 
-      - kolab-resource-handlers-2.0.99-20051220
+      - kolab-resource-handlers-2.0.99-20060201
 
 	* Resolved:
 	    Issue973  (change from-rewriting to look better in kontact)
 	    Issue1042 (dot-escaping bug)
 
-      - kolab-webadmin-2.0.99-20051220
+      - kolab-webadmin-2.0.99-20060201
 
 	* Resolved:
 	     Issue1023 (fix some typos in messages)
 
-      - kolabd-2.0.99-20051220
+      - kolabd-2.0.99-20060201
 
 	* Resolved:
 	     Issue1046 (fix an openpkg rc call in kolab_bootstrap)
@@ -76,7 +76,7 @@
 	     Issue1058 (Adding support for tar target)
 	     Issue1068 (mailboxes not created until kolabd restart)
 
-      - perl-kolab-5.8.7-20051220
+      - perl-kolab-5.8.7-20060201
 
 
 $Id$



From cvs at intevation.de  Wed Feb  1 20:28:02 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed,  1 Feb 2006 20:28:02 +0100 (CET)
Subject: thomas: server release-notes.txt,1.31,1.32 
Message-ID: <20060201192802.2998D10015B@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Marked some issues as unfixed.
Lines have to be removed for a new release, unless there is a new fix.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- release-notes.txt	1 Feb 2006 18:34:41 -0000	1.31
+++ release-notes.txt	1 Feb 2006 19:28:00 -0000	1.32
@@ -59,8 +59,8 @@
       - kolab-resource-handlers-2.0.99-20060201
 
 	* Resolved:
-	    Issue973  (change from-rewriting to look better in kontact)
-	    Issue1042 (dot-escaping bug)
+UNFIXED	    Issue973  (change from-rewriting to look better in kontact)
+UNFIXED	    Issue1042 (dot-escaping bug)
 
       - kolab-webadmin-2.0.99-20060201
 
@@ -74,7 +74,7 @@
 	     Issue1038 (remove perl-kolab/configure from repository)
 	     Issue1050 (Make DLs work for sending email)
 	     Issue1058 (Adding support for tar target)
-	     Issue1068 (mailboxes not created until kolabd restart)
+UNFIXED	     Issue1068 (mailboxes not created until kolabd restart)
 
       - perl-kolab-5.8.7-20060201
 



From cvs at intevation.de  Wed Feb  1 20:46:14 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed,  1 Feb 2006 20:46:14 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog,1.55,1.56 
Message-ID: <20060201194614.8CE651006C5@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
added resmgr_conffile_usr and resmgr_conffile_grp variables



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- ChangeLog	31 Jan 2006 22:20:15 -0000	1.55
+++ ChangeLog	1 Feb 2006 19:46:12 -0000	1.56
@@ -1,3 +1,11 @@
+2006-02-01 Marcus Hüwe <suse-tux at gmx.de>
+	Patch committed by Richard Bos
+	* dist_conf/common,
+	  dist_conf/kolab,
+	  dist_conf/suse,
+	  templates/resmgr.conf.template.in: added resmgr_conffile_usr and
+	  resmgr_conffile_grp variables.
+
 2006-01-31 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos
 	* dist_conf/common,



From cvs at intevation.de  Wed Feb  1 20:46:14 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed,  1 Feb 2006 20:46:14 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf common, 1.20, 1.21 kolab, 1.25,
	1.26 suse, 1.33, 1.34 
Message-ID: <20060201194614.B91A91006C5@lists.intevation.de>

Author: richard

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

Modified Files:
	common kolab suse 
Log Message:
added resmgr_conffile_usr and resmgr_conffile_grp variables



Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- common	31 Jan 2006 22:20:15 -0000	1.20
+++ common	1 Feb 2006 19:46:12 -0000	1.21
@@ -110,6 +110,8 @@
 	-e 's,[@]perl_kolab_rpm[@],$(perl_kolab_rpm),g' \
 	-e 's,[@]pkgdocdir[@],$(pkgdocdir),g' \
 	-e 's,[@]resmgr_confdir[@],$(resmgr_confdir),g' \
+	-e 's,[@]resmgr_conffile_grp[@],$(resmgr_conffile_grp),g' \
+	-e 's,[@]resmgr_conffile_usr[@],$(resmgr_conffile_usr),g' \
 	-e 's,[@]resmgr_filterdir[@],$(resmgr_filterdir),g' \
 	-e 's,[@]resmgr_grp[@],$(resmgr_grp),g' \
 	-e 's,[@]resmgr_logfile[@],$(resmgr_logfile),g' \

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- kolab	31 Jan 2006 22:20:15 -0000	1.25
+++ kolab	1 Feb 2006 19:46:12 -0000	1.26
@@ -166,6 +166,8 @@
 
 resmgr_logfile=${localstatedir}/resmgr/resmgr.log
 resmgr_confdir=${sysconfdir}/resmgr
+resmgr_conffile_usr=${kolab_musr}
+resmgr_conffile_grp=${kolab_grp}
 resmgr_filterdir=${localstatedir}/resmgr/filter
 # @l_musr@
 resmgr_usr=kolab

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- suse	31 Jan 2006 22:24:16 -0000	1.33
+++ suse	1 Feb 2006 19:46:12 -0000	1.34
@@ -140,6 +140,8 @@
 
 resmgr_logfile=${localstatedir}/log/resmgr.log
 resmgr_confdir=${sysconfdir}/kolab/resmgr
+resmgr_conffile_usr=nobody
+resmgr_conffile_grp=nobody
 resmgr_filterdir=${localstatedir}/resmgr/filter
 resmgr_usr=root
 resmgr_grp=root



From cvs at intevation.de  Wed Feb  1 20:46:14 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed,  1 Feb 2006 20:46:14 +0100 (CET)
Subject: richard: server/kolabd/kolabd/templates resmgr.conf.template.in, 1.3,
	1.4 
Message-ID: <20060201194614.DAFEC1006C6@lists.intevation.de>

Author: richard

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

Modified Files:
	resmgr.conf.template.in 
Log Message:
added resmgr_conffile_usr and resmgr_conffile_grp variables



Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- resmgr.conf.template.in	30 Dec 2005 10:46:27 -0000	1.3
+++ resmgr.conf.template.in	1 Feb 2006 19:46:12 -0000	1.4
@@ -1,7 +1,7 @@
 KOLAB_META_START
 TARGET=@resmgr_confdir@/resmgr.conf
 PERMISSIONS=0640
-OWNERSHIP=@kolab_musr@:@kolab_grp@
+OWNERSHIP=@resmgr_conffile_usr@:@resmgr_conffile_grp@
 KOLAB_META_END
 <?php
 



From cvs at intevation.de  Wed Feb  1 21:48:16 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed,  1 Feb 2006 21:48:16 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog,1.56,1.57 
Message-ID: <20060201204816.AB8EA1006B2@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
commented out the variable MYHOME and assigned it the value
@amavisd_home@ from the dist_conf file.  The LOGFILE variable has been
assigned the variable: @amavisd_logfile@
This makes it possible to use the template for other distributions as
well.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- ChangeLog	1 Feb 2006 19:46:12 -0000	1.56
+++ ChangeLog	1 Feb 2006 20:48:14 -0000	1.57
@@ -5,6 +5,10 @@
 	  dist_conf/suse,
 	  templates/resmgr.conf.template.in: added resmgr_conffile_usr and
 	  resmgr_conffile_grp variables.
+	* templates/amavisd.conf.template.in: commented out the variable
+	  MYHOME and assigned it the value @amavisd_home@ from the dist_conf
+	  file.  The LOGFILE variable has been assigned the variable:
+	  @amavisd_logfile@
 
 2006-01-31 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos



From cvs at intevation.de  Wed Feb  1 21:48:16 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed,  1 Feb 2006 21:48:16 +0100 (CET)
Subject: richard: server/kolabd/kolabd/templates amavisd.conf.template.in, 1.5,
	1.6 
Message-ID: <20060201204816.AE74D1006C2@lists.intevation.de>

Author: richard

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

Modified Files:
	amavisd.conf.template.in 
Log Message:
commented out the variable MYHOME and assigned it the value
@amavisd_home@ from the dist_conf file.  The LOGFILE variable has been
assigned the variable: @amavisd_logfile@
This makes it possible to use the template for other distributions as
well.



Index: amavisd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/amavisd.conf.template.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- amavisd.conf.template.in	15 Jan 2006 20:32:47 -0000	1.5
+++ amavisd.conf.template.in	1 Feb 2006 20:48:14 -0000	1.6
@@ -59,8 +59,7 @@
 
 # $MYHOME serves as a quick default for some other configuration settings.
 # More refined control is available with each individual setting further down.
-# $MYHOME is not used directly by the program. No trailing slash!
-#$MYHOME = '@amavisd_home@';   # (default is '@amavisd_home@')
+$MYHOME = '@amavisd_home@';
 
 # $mydomain serves as a quick default for some other configuration settings.
 # More refined control is available with each individual setting further down.
@@ -277,7 +276,7 @@
 #$SYSLOG_LEVEL = 'user.info';     # (facility.priority, default 'mail.info')
 
 # Log file (if not using syslog)
-$LOGFILE = "$MYHOME/amavis.log"; # (defaults to empty, no log)
+$LOGFILE = "@amavisd_logfile@"; # (defaults to empty, no log)
 
 #NOTE: levels are not strictly observed and are somewhat arbitrary
 # 0: startup/exit/failure messages, viruses detected



From cvs at intevation.de  Wed Feb  1 22:07:35 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed,  1 Feb 2006 22:07:35 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog,1.57,1.58 
Message-ID: <20060201210735.6C5F31006B2@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
Mention the tracker id

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- ChangeLog	1 Feb 2006 20:48:14 -0000	1.57
+++ ChangeLog	1 Feb 2006 21:07:33 -0000	1.58
@@ -8,7 +8,8 @@
 	* templates/amavisd.conf.template.in: commented out the variable
 	  MYHOME and assigned it the value @amavisd_home@ from the dist_conf
 	  file.  The LOGFILE variable has been assigned the variable:
-	  @amavisd_logfile@
+	  @amavisd_logfile@, see tracker:
+	  https://intevation.de/roundup/kolab/issue1088
 
 2006-01-31 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos



From cvs at intevation.de  Thu Feb  2 17:36:37 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu,  2 Feb 2006 17:36:37 +0100 (CET)
Subject: thomas: server/kolabd/kolabd kolabquotawarn,1.3.2.7,1.3.2.8 
Message-ID: <20060202163637.A6F4A1006D8@lists.intevation.de>

Author: thomas

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

Modified Files:
      Tag: kolab_2_0_branch
	kolabquotawarn 
Log Message:
Backported minor/cosmetic changes from HEAD.


Index: kolabquotawarn
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Attic/kolabquotawarn,v
retrieving revision 1.3.2.7
retrieving revision 1.3.2.8
diff -u -d -r1.3.2.7 -r1.3.2.8
--- kolabquotawarn	11 Jan 2006 20:44:49 -0000	1.3.2.7
+++ kolabquotawarn	2 Feb 2006 16:36:35 -0000	1.3.2.8
@@ -67,7 +67,7 @@
 
   my $text = sprintf( "kolabquotawarn: $fmt", @_ );
 
-  print STDERR "$text\n";
+  #print STDERR "$text\n";
   syslog $prio, $text;
 }
 
@@ -83,7 +83,8 @@
 #
 sub fatal_exit {
     my($first) = shift(@_);
-    #printf( STDERR "fatal: $first", @_ );
+    printf( STDERR "fatal: $first", @_ );
+    printf( STDERR "\n" );
     mylog("err", "fatal: $first", @_);
     exit 1;
 }
@@ -107,7 +108,7 @@
   fatal_exit( "Can't open quotawarning.txt" );
 }
 
-dbmopen( %quotawarn_db, $prefix.'/var/kolab/quotawarn.db', 0666 ) 
+dbmopen( %quotawarn_db, $prefix.'/var/kolab/quotawarn.db', 0666 )
   || fatal_exit ('Unable to open quotawarn db');
 
 if( $opt_d ) {
@@ -192,7 +193,7 @@
 
 ### Connect to Cyrus
 my $cyrus = Cyrus::IMAP::Admin->new('localhost');
-$cyrus || fatal_exit( 'Unable to connect to local Cyrus admin interface\n' );
+$cyrus || fatal_exit( 'Unable to connect to local Cyrus admin interface' );
 $cyrus->authenticate(
 					 'User'          => $Kolab::config{'cyrus_admin'},
 					 'Password'      => $Kolab::config{'cyrus_admin_pw'},



From cvs at intevation.de  Thu Feb  2 18:15:45 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu,  2 Feb 2006 18:15:45 +0100 (CET)
Subject: thomas: server/kolabd/kolabd kolabquotawarn.in,1.8,1.9 
Message-ID: <20060202171545.866AE1006D8@lists.intevation.de>

Author: thomas

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

Modified Files:
	kolabquotawarn.in 
Log Message:
Fixes for kolabquotawarn logging added in issue1012:
Don't use user-supplied strings as format string.
Make syslog message shorter by only using basename of kolabquotawarn.
Cyrus doesn't give back an error message, so don't use it.


Index: kolabquotawarn.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabquotawarn.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- kolabquotawarn.in	23 Jan 2006 21:38:23 -0000	1.8
+++ kolabquotawarn.in	2 Feb 2006 17:15:43 -0000	1.9
@@ -39,6 +39,7 @@
 use Kolab;
 use Kolab::Util;
 use Kolab::LDAP;
+use File::Basename;
 use vars qw($opt_d);
 
 Kolab::LDAP::startup;
@@ -65,7 +66,7 @@
   my $prio = shift;
   my $fmt = shift;
 
-  my $text = sprintf( "kolabquotawarn: $fmt", @_ );
+  my $text = sprintf( $fmt, @_ );
 
   #print STDERR "$text\n";
   syslog $prio, $text;
@@ -76,16 +77,15 @@
 # syslog so that people can actually see our messages.
 #
 setlogsock $syslog_socktype;
-openlog $0, $syslog_options, $syslog_facility;
+openlog basename($0), $syslog_options, $syslog_facility;
 
 #
 # Log an error and abort.
 #
 sub fatal_exit {
-    my($first) = shift(@_);
-    printf( STDERR "fatal: $first", @_ );
-    printf( STDERR "\n" );
-    mylog("err", "fatal: $first", @_);
+    my $fmt = shift;
+    printf( STDERR "fatal: $fmt\n", @_ );
+    mylog("err", "fatal: $fmt", @_);
     exit 1;
 }
 
@@ -141,9 +141,9 @@
   $mail->print if $opt_d;
   my $mailer = Mail::Transport::SMTP->new();
   if( $mailer->send( $mail ) ) {
-    mylog("info", "info: Sent quota warning message to $user because quota is at $pct%");
+    mylog("info", "info: Sent quota warning message to %s because quota is at %d%%", $user, $pct);
   } else {
-    mylog("err", "error: Failed sent quota warning message to $user");
+    mylog("err", "error: Failed sent quota warning message to %s", $user);
   }
 }
 
@@ -197,7 +197,7 @@
 					 'User'          => $Kolab::config{'cyrus_admin'},
 					 'Password'      => $Kolab::config{'cyrus_admin_pw'},
 					 'Mechanism'    => 'LOGIN', )
-  || fatal_exit("Unable to authenticate with Cyrus admin interface, Error = `" . $cyrus->error. "'");
+  || fatal_exit("Unable to authenticate with Cyrus admin interface");
 
 ### Mail offending users
 kolablistquotas( $cyrus, 'user/*', '*', $quotawarnpct );



From cvs at intevation.de  Thu Feb  2 18:15:52 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu,  2 Feb 2006 18:15:52 +0100 (CET)
Subject: thomas: server/kolabd/kolabd kolabquotawarn,1.3.2.8,1.3.2.9 
Message-ID: <20060202171552.646B41006DD@lists.intevation.de>

Author: thomas

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

Modified Files:
      Tag: kolab_2_0_branch
	kolabquotawarn 
Log Message:
Fixes for kolabquotawarn logging added in issue1012:
Don't use user-supplied strings as format string.
Make syslog message shorter by only using basename of kolabquotawarn.
Cyrus doesn't give back an error message, so don't use it.


Index: kolabquotawarn
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Attic/kolabquotawarn,v
retrieving revision 1.3.2.8
retrieving revision 1.3.2.9
diff -u -d -r1.3.2.8 -r1.3.2.9
--- kolabquotawarn	2 Feb 2006 16:36:35 -0000	1.3.2.8
+++ kolabquotawarn	2 Feb 2006 17:15:50 -0000	1.3.2.9
@@ -39,6 +39,7 @@
 use Kolab;
 use Kolab::Util;
 use Kolab::LDAP;
+use File::Basename;
 use vars qw($opt_d);
 
 Kolab::LDAP::startup;
@@ -65,7 +66,7 @@
   my $prio = shift;
   my $fmt = shift;
 
-  my $text = sprintf( "kolabquotawarn: $fmt", @_ );
+  my $text = sprintf( $fmt, @_ );
 
   #print STDERR "$text\n";
   syslog $prio, $text;
@@ -76,16 +77,15 @@
 # syslog so that people can actually see our messages.
 #
 setlogsock $syslog_socktype;
-openlog $0, $syslog_options, $syslog_facility;
+openlog basename($0), $syslog_options, $syslog_facility;
 
 #
 # Log an error and abort.
 #
 sub fatal_exit {
-    my($first) = shift(@_);
-    printf( STDERR "fatal: $first", @_ );
-    printf( STDERR "\n" );
-    mylog("err", "fatal: $first", @_);
+    my $fmt = shift;
+    printf( STDERR "fatal: $fmt\n", @_ );
+    mylog("err", "fatal: $fmt", @_);
     exit 1;
 }
 
@@ -142,9 +142,9 @@
   $mail->print if $opt_d;
   my $mailer = Mail::Transport::SMTP->new();
   if( $mailer->send( $mail ) ) {
-    mylog("info", "info: Sent quota warning message to $user because quota is at $pct%");
+    mylog("info", "info: Sent quota warning message to %s because quota is at %d%%", $user, $pct);
   } else {
-    mylog("err", "error: Failed sent quota warning message to $user");
+    mylog("err", "error: Failed sent quota warning message to %s", $user);
   }
 }
 
@@ -198,7 +198,7 @@
 					 'User'          => $Kolab::config{'cyrus_admin'},
 					 'Password'      => $Kolab::config{'cyrus_admin_pw'},
 					 'Mechanism'    => 'LOGIN', )
-  || fatal_exit("Unable to authenticate with Cyrus admin interface, Error = `" . $cyrus->error. "'");
+  || fatal_exit("Unable to authenticate with Cyrus admin interface");
 
 ### Mail offending users
 kolablistquotas( $cyrus, 'user/*', '*', $quotawarnpct );



From cvs at intevation.de  Thu Feb  2 18:19:18 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu,  2 Feb 2006 18:19:18 +0100 (CET)
Subject: thomas: server release-notes.txt,1.32,1.33 
Message-ID: <20060202171918.A5D4B1006D7@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Checkin for work-in-progress.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- release-notes.txt	1 Feb 2006 19:28:00 -0000	1.32
+++ release-notes.txt	2 Feb 2006 17:19:16 -0000	1.33
@@ -27,6 +27,18 @@
 	Issue1098 (Changes in the service tab are not accepted after
 	bootstrap) for details.
 
+      - Distribution lists without domain (like those created for
+	administative addresses in the services tab) break when edited
+	via the web interface, see Issue1100 for details.
+	A workaround is to manually create those lists for every domain
+	configured in the server.
+
+      - If modifying or deleting of address book entries doesn't work,
+	restarting openldap can help, see Issue854 for details.
+	Deleting address book entries doesn't automatically remove them
+	from distribution lists like it is done for users, see Issue848
+	for details.
+
 
 Changes since 2.1-20051215:
 
@@ -61,22 +73,33 @@
 	* Resolved:
 UNFIXED	    Issue973  (change from-rewriting to look better in kontact)
 UNFIXED	    Issue1042 (dot-escaping bug)
+	    Issue1010 (new build-mechanism)
 
       - kolab-webadmin-2.0.99-20060201
 
 	* Resolved:
-	     Issue1023 (fix some typos in messages)
+	    Issue730  (Cannot rename user in Kolab2 Admin interface)
+	    Issue809  (kolab web-admin dutch locale)
+	    Issue848  (remove deleted users from distribution lists)
+	    Issue1007 (kolab-webadmin autoconfiscation patch)
+	    Issue1023 (fix some typos in messages)
 
       - kolabd-2.0.99-20060201
 
 	* Resolved:
-	     Issue1046 (fix an openpkg rc call in kolab_bootstrap)
-	     Issue1038 (remove perl-kolab/configure from repository)
-	     Issue1050 (Make DLs work for sending email)
-	     Issue1058 (Adding support for tar target)
-UNFIXED	     Issue1068 (mailboxes not created until kolabd restart)
+	    Issue768  (virtual.template changes not picked up by kolabconf)
+TESTING	    Issue1012 (make koilabquotawarn log when it sends warning mails)
+	    Issue1027 (kolab showuser doesn't work)
+	    Issue1046 (fix an openpkg rc call in kolab_bootstrap)
+	    Issue1038 (remove perl-kolab/configure from repository)
+	    Issue1050 (Make DLs work for sending email)
+UNFIXED	    Issue1068 (mailboxes not created until kolabd restart)
 
       - perl-kolab-5.8.7-20060201
+
+	* Resolved:
+	    Issue1022 (autoconfiscation patch for perl-kolab)
+
 
 
 $Id$



From cvs at intevation.de  Fri Feb  3 08:05:13 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri,  3 Feb 2006 08:05:13 +0100 (CET)
Subject: martin: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
	freebusy.conf, 1.1.1.1, 1.2 freebusycache.class.php, 1.16, 1.17 
Message-ID: <20060203070513.CE8A0100161@lists.intevation.de>

Author: martin

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

Modified Files:
	freebusy.conf freebusycache.class.php 
Log Message:
Martin Konold: Make database type configurable but leave the default gdbm


Index: freebusy.conf
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.conf,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- freebusy.conf	11 Jun 2004 10:52:23 -0000	1.1.1.1
+++ freebusy.conf	3 Feb 2006 07:05:11 -0000	1.2
@@ -62,3 +62,6 @@
 // Should we send a Content-Disposition header, indicating what the name of the
 // resulting VFB file should be?
 $params['send_content_disposition'] = false;
+
+// What db type to use for freebusy caches 
+$params['dbtype'] = 'gdbm';

Index: freebusycache.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusycache.class.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- freebusycache.class.php	1 Jul 2005 11:55:48 -0000	1.16
+++ freebusycache.class.php	3 Feb 2006 07:05:11 -0000	1.17
@@ -20,6 +20,10 @@
 
 /*! To load/store partial freebusy lists
     and their ACLs */
+    
+require_once('freebusy/misc.php');
+require_once('@resmgr_confdir@/freebusy.conf');
+
 class FreeBusyCache {
   function FreeBusyCache( $basedir, $extended = false ) {
     $this->basedir = $basedir;
@@ -27,6 +31,7 @@
   }
 
   function store( $filename, $fbdata, $acl, $relevance ) {
+    global $params;
     if( ereg( '\.\.', $filename ) ) {
       $this->error = $filename._(' is not absolute');
       return false;
@@ -40,7 +45,7 @@
       // false data means delete the pfb
       unlink($fbfilename);
       $oldacl = $this->loadACL( $filename );
-      $db = dba_open( $this->basedir.'/pfbcache.db', 'cd', 'gdbm' );
+      $db = dba_open( $this->basedir.'/pfbcache.db', 'cd', $params['dbtype'] );
       if( $db === false ) return false;
       foreach( $oldacl as $ac ) {
 	  if( dba_exists( $ac['USER'], $db ) ) {
@@ -87,7 +92,7 @@
       default: $perm = 'a';
       }
 
-      $db = dba_open( $this->basedir.'/pfbcache.db', 'cd', 'gdbm' );
+      $db = dba_open( $this->basedir.'/pfbcache.db', 'cd', $params['dbtype'] );
       if( $db === false ) {
 	myLog('Unable to open freebusy cache db '.$this->basedir.'/pfbcache.db',
 	      RM_LOG_ERROR );
@@ -136,10 +141,11 @@
   }
 
   function delete( $filename ) {
+    global $params;
     $fbfilename = $this->mkfbfilename($filename);
     unlink($fbfilename);
     unlink($this->mkaclfilename($filename));    
-    $db = dba_open( $this->basedir.'/pfbcache.db', 'cd', 'gdbm' );
+    $db = dba_open( $this->basedir.'/pfbcache.db', 'cd', $params['dbtype'] );
     if( $db === false ) return false;
     for( $uid = dba_firstkey($db); $uid !== false; $uid = dba_nextkey($db)) {
       $lst = dba_fetch( $uid, $db );
@@ -152,8 +158,9 @@
   }
 
   function findAll( $uid, $groups ) {
+    global $params;
     $lst = array();
-    $db = dba_open( $this->basedir.'/pfbcache.db', 'cd', 'gdbm' );
+    $db = dba_open( $this->basedir.'/pfbcache.db', 'rd', $params['dbtype'] );
     if( $db === false ) return false;
     $uids = $groups;
     for( $i = 0; $i < count($uids); $i++ ) $uids[$i] = 'group:'.$uids[$i];



From cvs at intevation.de  Fri Feb  3 15:12:56 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri,  3 Feb 2006 15:12:56 +0100 (CET)
Subject: bh: server obmtool.conf,1.216,1.217 
Message-ID: <20060203141256.3381F1005B0@lists.intevation.de>

Author: bh

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

Modified Files:
	obmtool.conf 
Log Message:
another new kolabd RPM


Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -d -r1.216 -r1.217
--- obmtool.conf	1 Feb 2006 17:44:34 -0000	1.216
+++ obmtool.conf	3 Feb 2006 14:12:54 -0000	1.217
@@ -146,7 +146,7 @@
 #    @install ${loc}vim-6.3.78-2.4.0
 #    @install ${plusloc}dcron-2.9-2.4.0
     @install ${altloc}perl-kolab-5.8.7-20060201
-    @install ${altloc}kolabd-2.0.99-20060201 --define kolab_version=$kolab_version
+    @install ${altloc}kolabd-2.0.99-20060203 --define kolab_version=$kolab_version
     @install ${altloc}kolab-webadmin-2.0.99-20060201 --define kolab_version=$kolab_version
 	@install ${altloc}kolab-horde-framework-2.0.99-20051220 --define kolab_version=$kolab_version
     @install ${altloc}kolab-resource-handlers-2.0.99-20060201 --define kolab_version=$kolab_version



From cvs at intevation.de  Fri Feb  3 15:32:09 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri,  3 Feb 2006 15:32:09 +0100 (CET)
Subject: thomas: server release-notes.txt,1.33,1.34 
Message-ID: <20060203143209.77DE61005B0@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Fixed indentation, removed unfixed issues, TESTING issue is now confirmed to be resolved.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- release-notes.txt	2 Feb 2006 17:19:16 -0000	1.33
+++ release-notes.txt	3 Feb 2006 14:32:07 -0000	1.34
@@ -22,22 +22,22 @@
 
 Known problems:
 
-      - After bootstrapping please stop kolab and start it again, see
-	Issue1068 (Mailboxes are not created until kolabd restart) and
-	Issue1098 (Changes in the service tab are not accepted after
-	bootstrap) for details.
+    - After bootstrapping please stop kolab and start it again, see
+      Issue1068 (Mailboxes are not created until kolabd restart) and
+      Issue1098 (Changes in the service tab are not accepted after
+      bootstrap) for details.
 
-      - Distribution lists without domain (like those created for
-	administative addresses in the services tab) break when edited
-	via the web interface, see Issue1100 for details.
-	A workaround is to manually create those lists for every domain
-	configured in the server.
+    - Distribution lists without domain (like those created for
+      administative addresses in the services tab) break when edited
+      via the web interface, see Issue1100 for details.
+      A workaround is to manually create those lists for every domain
+      configured in the server.
 
-      - If modifying or deleting of address book entries doesn't work,
-	restarting openldap can help, see Issue854 for details.
-	Deleting address book entries doesn't automatically remove them
-	from distribution lists like it is done for users, see Issue848
-	for details.
+    - If modifying or deleting of address book entries doesn't work,
+      restarting openldap can help, see Issue854 for details.
+      Deleting address book entries doesn't automatically remove them
+      from distribution lists like it is done for users, see Issue848
+      for details.
 
 
 Changes since 2.1-20051215:
@@ -71,8 +71,6 @@
       - kolab-resource-handlers-2.0.99-20060201
 
 	* Resolved:
-UNFIXED	    Issue973  (change from-rewriting to look better in kontact)
-UNFIXED	    Issue1042 (dot-escaping bug)
 	    Issue1010 (new build-mechanism)
 
       - kolab-webadmin-2.0.99-20060201
@@ -88,12 +86,11 @@
 
 	* Resolved:
 	    Issue768  (virtual.template changes not picked up by kolabconf)
-TESTING	    Issue1012 (make koilabquotawarn log when it sends warning mails)
+	    Issue1012 (make koilabquotawarn log when it sends warning mails)
 	    Issue1027 (kolab showuser doesn't work)
 	    Issue1046 (fix an openpkg rc call in kolab_bootstrap)
 	    Issue1038 (remove perl-kolab/configure from repository)
 	    Issue1050 (Make DLs work for sending email)
-UNFIXED	    Issue1068 (mailboxes not created until kolabd restart)
 
       - perl-kolab-5.8.7-20060201
 



From cvs at intevation.de  Fri Feb  3 15:34:56 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri,  3 Feb 2006 15:34:56 +0100 (CET)
Subject: thomas: server release-notes.txt,1.34,1.35 
Message-ID: <20060203143456.DE2481005B0@lists.intevation.de>

Author: thomas

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

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


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- release-notes.txt	3 Feb 2006 14:32:07 -0000	1.34
+++ release-notes.txt	3 Feb 2006 14:34:54 -0000	1.35
@@ -82,7 +82,7 @@
 	    Issue1007 (kolab-webadmin autoconfiscation patch)
 	    Issue1023 (fix some typos in messages)
 
-      - kolabd-2.0.99-20060201
+      - kolabd-2.0.99-20060203
 
 	* Resolved:
 	    Issue768  (virtual.template changes not picked up by kolabconf)



From cvs at intevation.de  Fri Feb  3 15:45:24 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri,  3 Feb 2006 15:45:24 +0100 (CET)
Subject: bh: server README.1st,1.33,1.34 
Message-ID: <20060203144524.2386A1005B0@lists.intevation.de>

Author: bh

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

Modified Files:
	README.1st 
Log Message:
Update for new release


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- README.1st	1 Feb 2006 17:07:59 -0000	1.33
+++ README.1st	3 Feb 2006 14:45:22 -0000	1.34
@@ -159,6 +159,12 @@
 The IMAP server should work without further changes.
 
 
+Upgrade from pre-2.1-snapshot-20051215
+--------------------------------------
+
+Nothing special has to be done for this upgrade.
+
+
 
 $Id$
 



From cvs at intevation.de  Fri Feb  3 15:53:58 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri,  3 Feb 2006 15:53:58 +0100 (CET)
Subject: bh: server obmtool.conf,1.217,1.218 
Message-ID: <20060203145358.254F31005B0@lists.intevation.de>

Author: bh

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

Modified Files:
	obmtool.conf 
Log Message:
update kolab_version


Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -d -r1.217 -r1.218
--- obmtool.conf	3 Feb 2006 14:12:54 -0000	1.217
+++ obmtool.conf	3 Feb 2006 14:53:56 -0000	1.218
@@ -24,7 +24,7 @@
 
 %kolab
     echo "---- boot/build ${NODE} %${CMD} ----"
-    kolab_version="pre-2.1-snapshot-20060201";
+    kolab_version="2.1beta1";
     PREFIX=/${CMD};
     loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
     plusloc='+'



From cvs at intevation.de  Sat Feb  4 18:03:35 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat,  4 Feb 2006 18:03:35 +0100 (CET)
Subject: thomas: doc/www/src about-kolab-server.html.m4,1.3,1.4 
Message-ID: <20060204170335.871571005C5@lists.intevation.de>

Author: thomas

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

Modified Files:
	about-kolab-server.html.m4 
Log Message:
Néerlandais -> Nederlands. Added english language names.


Index: about-kolab-server.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/about-kolab-server.html.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- about-kolab-server.html.m4	10 Aug 2005 07:19:10 -0000	1.3
+++ about-kolab-server.html.m4	4 Feb 2006 17:03:33 -0000	1.4
@@ -32,7 +32,8 @@
 <ul>
 <li> Full seamless support of mixed clients environments (Outlook/KDE/Web)
 <li> A web administration interface<br>
-     Supported languages: Deutsch, English, Français, Néerlandais
+     Supported languages: Deutsch (German), English, Français (French),
+     Nederlands (Dutch)
 <li> A shared address book with provision for mailbox users as well as contacts
 <li> POP3 as well as IMAP4(rev1) access to mail
 <li> Client-side full support of S/MIME



From cvs at intevation.de  Sat Feb  4 19:20:00 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat,  4 Feb 2006 19:20:00 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog,1.58,1.59 
Message-ID: <20060204182000.91D6D100161@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
Changed the owner and group from root to respectively:
@emailserver_usr@ and @emailserver_grp at .

This means that the ownership and group changed to respectively:
kolab-n and kolab-r!

See https://intevation.de/roundup/kolab/issue1083

The actual diff is:
diff -r BEF/kolab/etc/kolab/templates/ldapdistlist.cf.template AFT/kolab/etc/kolab/templates/ldapdistlist.cf.template
4c4
< OWNERSHIP=root:root
---
> OWNERSHIP=kolab-n:kolab-r
diff -r BEF/kolab/etc/kolab/templates/master.cf.template AFT/kolab/etc/kolab/templates/master.cf.template
4c4
< OWNERSHIP=root:root
---
> OWNERSHIP=kolab-n:kolab-r
diff -r BEF/kolab/etc/kolab/templates/smtpd.conf.template AFT/kolab/etc/kolab/templates/smtpd.conf.template
4c4
< OWNERSHIP=root:root
---
> OWNERSHIP=kolab-n:kolab-r
diff -r BEF/kolab/etc/kolab/templates/transport.template AFT/kolab/etc/kolab/templates/transport.template
4c4
< OWNERSHIP=root:root
---
> OWNERSHIP=kolab-n:kolab-r
diff -r BEF/kolab/etc/kolab/templates/virtual.template AFT/kolab/etc/kolab/templates/virtual.template
4c4
< OWNERSHIP=root:root
---
> OWNERSHIP=kolab-n:kolab-r





Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- ChangeLog	1 Feb 2006 21:07:33 -0000	1.58
+++ ChangeLog	4 Feb 2006 18:19:58 -0000	1.59
@@ -1,3 +1,14 @@
+2006-02-04 Richard Bos <richard at radoeka.nl>
+	* templates/ldapdistlist.cf.template.in,
+	  templates/master.cf.template.in,
+	  templates/smtpd.conf.template.in,
+	  templates/transport.template.in,
+	  templates/virtual.template.in: changed the owner and group from
+	  root to respectively: @emailserver_usr@ and @emailserver_grp at .
+	  This means that the ownership and group changed to respectively:
+	  kolab-n and kolab-r!
+	  See https://intevation.de/roundup/kolab/issue1083
+
 2006-02-01 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos
 	* dist_conf/common,



From cvs at intevation.de  Sat Feb  4 19:20:00 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat,  4 Feb 2006 19:20:00 +0100 (CET)
Subject: richard: server/kolabd/kolabd/templates ldapdistlist.cf.template.in,
	1.2, 1.3 master.cf.template.in, 1.8, 1.9 smtpd.conf.template.in,
	1.2, 1.3 transport.template.in, 1.2, 1.3 virtual.template.in,
	1.2, 1.3 
Message-ID: <20060204182000.9B64A1005A8@lists.intevation.de>

Author: richard

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

Modified Files:
	ldapdistlist.cf.template.in master.cf.template.in 
	smtpd.conf.template.in transport.template.in 
	virtual.template.in 
Log Message:
Changed the owner and group from root to respectively:
@emailserver_usr@ and @emailserver_grp at .

This means that the ownership and group changed to respectively:
kolab-n and kolab-r!

See https://intevation.de/roundup/kolab/issue1083

The actual diff is:
diff -r BEF/kolab/etc/kolab/templates/ldapdistlist.cf.template AFT/kolab/etc/kolab/templates/ldapdistlist.cf.template
4c4
< OWNERSHIP=root:root
---
> OWNERSHIP=kolab-n:kolab-r
diff -r BEF/kolab/etc/kolab/templates/master.cf.template AFT/kolab/etc/kolab/templates/master.cf.template
4c4
< OWNERSHIP=root:root
---
> OWNERSHIP=kolab-n:kolab-r
diff -r BEF/kolab/etc/kolab/templates/smtpd.conf.template AFT/kolab/etc/kolab/templates/smtpd.conf.template
4c4
< OWNERSHIP=root:root
---
> OWNERSHIP=kolab-n:kolab-r
diff -r BEF/kolab/etc/kolab/templates/transport.template AFT/kolab/etc/kolab/templates/transport.template
4c4
< OWNERSHIP=root:root
---
> OWNERSHIP=kolab-n:kolab-r
diff -r BEF/kolab/etc/kolab/templates/virtual.template AFT/kolab/etc/kolab/templates/virtual.template
4c4
< OWNERSHIP=root:root
---
> OWNERSHIP=kolab-n:kolab-r





Index: ldapdistlist.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/ldapdistlist.cf.template.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ldapdistlist.cf.template.in	30 Dec 2005 21:13:22 -0000	1.2
+++ ldapdistlist.cf.template.in	4 Feb 2006 18:19:58 -0000	1.3
@@ -1,7 +1,7 @@
 KOLAB_META_START
 TARGET=@emailserver_confdir@/ldapdistlist.cf
 PERMISSIONS=0640
-OWNERSHIP=root:root
+OWNERSHIP=@emailserver_usr@:@emailserver_grp@
 KOLAB_META_END
 # (c) 2005 Steffen Hansen <steffen at klaralvdalens-datakonsult.se> (Klaralvdalens Datakonsult AB)
 #

Index: master.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- master.cf.template.in	18 Jan 2006 19:43:11 -0000	1.8
+++ master.cf.template.in	4 Feb 2006 18:19:58 -0000	1.9
@@ -1,7 +1,7 @@
 KOLAB_META_START
 TARGET=@emailserver_confdir@/master.cf
 PERMISSIONS=0640
-OWNERSHIP=root:root
+OWNERSHIP=@emailserver_usr@:@emailserver_grp@
 KOLAB_META_END
 # (c) 2004 Steffen Hansen <steffen at klaralvdalens-datakonsult.se> (Klaralvdalens Datakonsult AB)
 # (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>

Index: smtpd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/smtpd.conf.template.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- smtpd.conf.template.in	15 Jan 2006 10:46:35 -0000	1.2
+++ smtpd.conf.template.in	4 Feb 2006 18:19:58 -0000	1.3
@@ -1,7 +1,7 @@
 KOLAB_META_START
 TARGET=@sasl_smtpconffile@
 PERMISSIONS=0644
-OWNERSHIP=root:root
+OWNERSHIP=@emailserver_usr@:@emailserver_grp@
 KOLAB_META_END
 pwcheck_method: saslauthd
 mech_list: plain login

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

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



From cvs at intevation.de  Sat Feb  4 21:10:23 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat,  4 Feb 2006 21:10:23 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
	messages.po, 1.14, 1.15 
Message-ID: <20060204201023.EC57810015B@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
Add missing spaces

Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES/messages.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- messages.po	17 Jan 2006 20:12:41 -0000	1.14
+++ messages.po	4 Feb 2006 20:10:21 -0000	1.15
@@ -507,7 +507,7 @@
 
 #: tpl_messages.php:102 ../include/menu.php:59
 msgid "Distribution Lists"
-msgstr "Distributielijst"
+msgstr "Distributielijsten"
 
 #: tpl_messages.php:103
 msgid "Listname"
@@ -1843,11 +1843,11 @@
 
 #: ../../../www/admin/distributionlist/list.php:296
 msgid "Distribution List "
-msgstr "Distributielijst"
+msgstr "Distributielijst "
 
 #: ../../../www/admin/distributionlist/list.php:296
 msgid " deleted"
-msgstr "verwijderd"
+msgstr " verwijderd"
 
 #: ../../../www/admin/distributionlist/list.php:300
 #, php-format



From cvs at intevation.de  Sat Feb  4 21:45:49 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat,  4 Feb 2006 21:45:49 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
	messages.po, 1.15, 1.16 
Message-ID: <20060204204549.43C50100159@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
Make capital character

Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES/messages.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- messages.po	4 Feb 2006 20:10:21 -0000	1.15
+++ messages.po	4 Feb 2006 20:45:47 -0000	1.16
@@ -352,7 +352,7 @@
 "Kolab server is <a href=\"http://www.kolab.org/kolab-plugins.html"
 "\">maintained on the Kolab website</a>."
 msgstr ""
-"een lijst van bijkomende Outlook plug-ins die voor samenwerking zorgt met "
+"Een lijst van bijkomende Outlook plug-ins die voor samenwerking zorgt met "
 "de Kolab server zijn <a href=\"http://www.kolab.org/kolab-plugins.html"
 "\">wordt onderhouden op de Kolab website</a>."
 



From cvs at intevation.de  Sat Feb  4 21:59:15 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat,  4 Feb 2006 21:59:15 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/templates
	page.tpl.in, 1.1, 1.2 
Message-ID: <20060204205915.AFA52100159@lists.intevation.de>

Author: richard

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

Modified Files:
	page.tpl.in 
Log Message:
Add missing style attribute.  Without the w3c XHTML and CSS logos are
shown (from the comment at the bottom of the page).



Index: page.tpl.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/page.tpl.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- page.tpl.in	30 Dec 2005 11:07:17 -0000	1.1
+++ page.tpl.in	4 Feb 2006 20:59:13 -0000	1.2
@@ -14,7 +14,7 @@
 <meta http-equiv="Content-Language" content="{$currentlang}" /> 
 <meta name="description" content="Kolab Administration Webintefrace" />
 <meta name="keywords" content="Linux, Unix, Groupware, Email, Calendar" />
-<link rel="stylesheet" href="{$stylesheet|default:"$topdir/style.css"}" />
+<link rel="stylesheet" type="text/css" href="{$stylesheet|default:"$topdir/style.css"}" />
 
 <script type="text/javascript">
 <!--



From cvs at intevation.de  Sun Feb  5 18:51:33 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  5 Feb 2006 18:51:33 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog,1.59,1.60 
Message-ID: <20060205175133.812CF100159@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
Introduce a new build variable: kolab_php_module_prefix.
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.
This prevents scattering of the kolab php files.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- ChangeLog	4 Feb 2006 18:19:58 -0000	1.59
+++ ChangeLog	5 Feb 2006 17:51:31 -0000	1.60
@@ -1,3 +1,10 @@
+2006-02-05 Richard Bos <richard at radoeka.nl>
+	* dist_conf/common, dist_conf/kolab, dist_conf/suse'
+	  templates/session_vars.php.template.in: introduce a new build
+	  variable: kolab_php_module_prefix.  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.  This prevents scattering of sources.
+
 2006-02-04 Richard Bos <richard at radoeka.nl>
 	* templates/ldapdistlist.cf.template.in,
 	  templates/master.cf.template.in,



From cvs at intevation.de  Sun Feb  5 18:51:33 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  5 Feb 2006 18:51:33 +0100 (CET)
Subject: richard: server/kolabd/kolabd/templates session_vars.php.template.in,
	1.3, 1.4 
Message-ID: <20060205175133.8C9FB1005A4@lists.intevation.de>

Author: richard

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

Modified Files:
	session_vars.php.template.in 
Log Message:
Introduce a new build variable: kolab_php_module_prefix.
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.
This prevents scattering of the kolab php files.



Index: session_vars.php.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/session_vars.php.template.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- session_vars.php.template.in	16 Jan 2006 11:38:22 -0000	1.3
+++ session_vars.php.template.in	5 Feb 2006 17:51:31 -0000	1.4
@@ -1,5 +1,5 @@
 KOLAB_META_START
-TARGET=@phplibdir2@/admin/include/session_vars.php
+TARGET=@phplibdir2@/@kolab_php_module_prefix at admin/include/session_vars.php
 PERMISSIONS=0640
 OWNERSHIP=@webserver_musr@:@kolab_grp@
 KOLAB_META_END



From cvs at intevation.de  Sun Feb  5 18:51:33 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  5 Feb 2006 18:51:33 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf common, 1.21, 1.22 kolab, 1.26,
	1.27 suse, 1.34, 1.35 
Message-ID: <20060205175133.8E9391005C7@lists.intevation.de>

Author: richard

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

Modified Files:
	common kolab suse 
Log Message:
Introduce a new build variable: kolab_php_module_prefix.
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.
This prevents scattering of the kolab php files.



Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- common	1 Feb 2006 19:46:12 -0000	1.21
+++ common	5 Feb 2006 17:51:31 -0000	1.22
@@ -83,6 +83,7 @@
 	-e 's,[@]kolab_mailboxuiddb[@],$(kolab_mailboxuiddb),g' \
 	-e 's,[@]kolab_mgrp[@],$(kolab_mgrp),g' \
 	-e 's,[@]kolab_musr[@],$(kolab_musr),g' \
+	-e 's,[@]kolab_php_module_prefix[@],$(kolab_php_module_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' \

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- kolab	1 Feb 2006 19:46:12 -0000	1.26
+++ kolab	5 Feb 2006 17:51:31 -0000	1.27
@@ -116,6 +116,7 @@
 perl_kolab_rpm=perl-kolab
 kolab_smtpdpolicy_conffile_usr=${kolab_musr}
 kolab_smtpdpolicy_conffile_grp=${kolab_grp}
+kolab_php_module_prefix=
 
 ldapserver_statedir=${localstatedir}/openldap
 ldapserver_dir=${ldapserver_statedir}/openldap-data

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- suse	1 Feb 2006 19:46:12 -0000	1.34
+++ suse	5 Feb 2006 17:51:31 -0000	1.35
@@ -96,6 +96,7 @@
 perl_kolab_rpm=perl-kolab
 kolab_smtpdpolicy_conffile_usr=root
 kolab_smtpdpolicy_conffile_grp=nobody
+kolab_php_module_prefix=kolab/
 
 ldapserver_statedir=${localstatedir}/lib/ldap
 ldapserver_dir=${localstatedir}/lib/ldap



From cvs at intevation.de  Sun Feb  5 18:52:51 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  5 Feb 2006 18:52:51 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf suse,1.35,1.36 
Message-ID: <20060205175251.4DA27100159@lists.intevation.de>

Author: richard

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

Modified Files:
	suse 
Log Message:
Add explanation

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- suse	5 Feb 2006 17:51:31 -0000	1.35
+++ suse	5 Feb 2006 17:52:49 -0000	1.36
@@ -96,6 +96,10 @@
 perl_kolab_rpm=perl-kolab
 kolab_smtpdpolicy_conffile_usr=root
 kolab_smtpdpolicy_conffile_grp=nobody
+
+# 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
+# /usr/share/php. This prevents scattering of the kolab php files.
 kolab_php_module_prefix=kolab/
 
 ldapserver_statedir=${localstatedir}/lib/ldap



From cvs at intevation.de  Sun Feb  5 21:02:04 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  5 Feb 2006 21:02:04 +0100 (CET)
Subject: richard: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
	freebusy.class.php.in, NONE, 1.1 freebusycache.class.php.in,
	NONE, 1.1 freebusy.class.php, 1.29, NONE freebusycache.class.php,
	1.17, NONE 
Message-ID: <20060205200204.F1D341006B1@lists.intevation.de>

Author: richard

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

Added Files:
	freebusy.class.php.in freebusycache.class.php.in 
Removed Files:
	freebusy.class.php freebusycache.class.php 
Log Message:
Use the new kolab_php_module_prefix variable



--- NEW FILE: freebusy.class.php.in ---
<?php
/*
 *  Copyright (c) 2004 Klaraelvdalens Datakonsult AB
 *
 *    Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
 *
 *  This  program is free  software; you can redistribute  it and/or
 *  modify it  under the terms of the GNU  General Public License as
 *  published by the  Free Software Foundation; either version 2, or
 *  (at your option) any later version.
 *
 *  This program is  distributed in the hope that it will be useful,
 *  but WITHOUT  ANY WARRANTY; without even the  implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 *  General Public License for more details.
 *
 *  You can view the  GNU General Public License, online, at the GNU
 *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
 */

require_once 'freebusy/recurrence.class.php';

class FreeBusyRecurrence extends Recurrence {
  function FreeBusyRecurrence( &$vfb, &$extra ) {
    $this->vfb =& $vfb;
    $this->extra =& $extra;
  }

  function setBusy( $start, $end, $duration ) {
    $this->vfb->addBusyPeriod('BUSY', $start, null, $duration, $this->extra);
  }

  var $vfb;
  var $extra;
};

class FreeBusy {
  function FreeBusy( $username, 
		     $password, 
		     $imaphost,
		     $fbfuture=60,
		     $fbpast=0 ) {
    $this->username = $username;
    $this->password = $password;
    $this->imaphost = $imaphost;
    $this->fbfuture = $fbfuture;
    $this->fbpast   = $fbpast;
  }

  function imapConnect() {
    require_once('Net/IMAP.php');
    $this->imap = &new Net_IMAP( $this->imaphost, $this->imapport );
    #$this->imap->setDebug(true);
    return $this->imap;
  }

  function imapDisconnect() {
    return $this->imap->disconnect();
  }

  function imapLogin() {
    return $this->imap->login($this->username,$this->password, true, false);
  }

  function imapOpenMailbox($foldername = 'INBOX') {
    $this->foldername = $foldername;
    $rc = $this->imap->selectMailbox( $foldername );
    $a  = $this->imap->getAnnotation( '/vendor/kolab/folder-type', '*' );
    //myLog( "$folder has annotation: ".print_r($a,true), RM_LOG_DEBUG);
    return $rc;
  }

  function getACL() {
    return $this->imap->getACL();
  }

  function getRelevance() {
    $val = $this->imap->getAnnotation( '/vendor/kolab/incidences-for', 'value.shared' );
    if( PEAR::isError($val) || empty($val) ) {
      myLog("No /vendor/kolab/incidences-for found for ".$this->foldername, RM_LOG_DEBUG);
      return 'admins';
    } else {
      myLog("/vendor/kolab/incidences-for = ".print_r($val,true)." for ".$this->foldername, RM_LOG_DEBUG);
      return $val;
    }
  }

  function &generateFreeBusy($startstamp = NULL, $endstamp = NULL ) {
  
    require_once 'PEAR.php';
    require_once 'Horde/iCalendar.php';
    require_once 'Horde/MIME.php';
    require_once 'Horde/MIME/Message.php';
    require_once 'Horde/MIME/Structure.php';
  
    // Default the start date to today.
    if (is_null($startstamp)) {
      $month = date('n');
      $year = date('Y');
      $day = date('j');
    
      $startstamp = strtotime( '-'.$this->fbpast.' days', mktime(0, 0, 0, $month, $day, $year) );
    }
  
    // Default the end date to the start date + freebusy_days.
    if (is_null($endstamp) || $endstamp < $startstamp) {
      $endstamp = strtotime( '+'.$this->fbfuture.' days', $startstamp );
    }

    myLog("Creating pfb from $startstamp to $endstamp", RM_LOG_DEBUG);
  
    // Create the new iCalendar.
    $vCal = &new Horde_iCalendar();
    $vCal->setAttribute('PRODID', '-//proko2//freebusy 1.0//EN');
    $vCal->setAttribute('METHOD', 'PUBLISH');
  
    // Create new vFreebusy.
    $vFb = &Horde_iCalendar::newComponent('vfreebusy', $vCal);
    $vFb->setAttribute('ORGANIZER', 'MAILTO:' . $this->username);
  
    $vFb->setAttribute('DTSTAMP', time());
    $vFb->setAttribute('DTSTART', $startstamp);
    $vFb->setAttribute('DTEND', $endstamp);
    // URL is not required, so out it goes...
    //$vFb->setAttribute('URL', 'http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']);
  
    if( $this->imap->getNumberOfMessages() == 0 ) {
      $vFb->setAttribute('DTSTART', 0, array(), false );
      $vFb->setAttribute('DTEND', 0, array(), false );
      $vFb->setAttribute('COMMENT', 'This is a dummy vfreebusy that indicates an empty calendar');
      /* It seems to be a bad idea to put bogus values in pfbs
       * so we accept that they are not completely in line 
       * with the rfc and take care of the problem when merging 
       * pfbs to ifbs later 
       */
      //$vFb->addBusyPeriod( 'BUSY', 0,0, null );
      $vCal->addComponent($vFb);
      return array($vCal->exportvCalendar(),$vCal->exportvCalendar());
    }
	myLog("Reading messagelist", RM_LOG_DEBUG);
	$getMessages_start = microtime_float();
	$msglist = &$this->imap->getMessagesList();
	//$msglist = &$this->imap->getMessages();
	myLog("FreeBusy::imap->getMessagesList() took ".(microtime_float()-$getMessages_start)." secs.", RM_LOG_DEBUG);
    if( PEAR::isError( $msglist ) ) return array( $msglist, null);
	foreach ($msglist as $msginfo) {
	  //myLog("Reading message ".$msginfo['msg_id'], RM_LOG_DEBUG);
	  $textmsg = &$this->imap->getMsg($msginfo['msg_id']);
      $mimemsg = &MIME_Structure::parseTextMIMEMessage($textmsg);
    
      // Read in a Kolab event object, if one exists
      $parts = $mimemsg->contentTypeMap();
      $event = false;
      foreach ($parts as $mimeid => $conttype) {
	if ($conttype == 'application/x-vnd.kolab.event') {
	  $part = $mimemsg->getPart($mimeid);
	  $part->transferDecodeContents();
	  $event = $this->getEventHash($part->getContents());
	  if ($event === false) {
	    myLog("No x-vnd.kolab.event in ".$part->getContents(), RM_LOG_DEBUG);
	    continue;
	  }
	}
      }
    
      if ($event === false) {
	myLog("No x-vnd.kolab.events at all ", RM_LOG_DEBUG);
	continue;
      }
      
      $uid = $event['uid'];
      /*
      // See if we need to ignore this event
      if (isset($params['ignore'][$uid])) {
	trigger_error("Ignoring event with uid=$uid", E_USER_NOTICE);
	continue;
      }
      */

      if( array_key_exists( 'show-time-as', $event ) && 
	  strtolower(trim($event['show-time-as'])) == 'free' ) {
	continue;
      }
    
      $summary = ($event['sensitivity'] == 'public' ? $event['summary'] : '');
    
      //myLog("Looking at message with uid=$uid and summary=$summary", RM_LOG_DEBUG);
    
      // Get the events initial start
      $initial_start = $event['start-date'];
      $initial_end = $event['end-date'];
      if( $event['allday'] ) {
	$initial_end = strtotime( '+1 day', $initial_start );
	myLog("Detected all-day event $uid", RM_LOG_DEBUG);
      }
      $extra = array( 'X-UID'     => base64_encode($uid) );
      if (!empty($summary)) {
	$extra['X-SUMMARY'] = base64_encode($summary);
      }
      if( !empty($event['scheduling-id']) ) {
	$extra['X-SID'] = base64_encode($event['scheduling-id']);
      }

      if( array_key_exists( 'recurrence', $event ) ) {	
	myLog("Detected recurring event $uid", RM_LOG_DEBUG);
	$rec = $event['recurrence'];
	$recurrence =& new FreeBusyRecurrence( $vFb, $extra );
	$recurrence->setStartDate( $initial_start );
	$recurrence->setEndDate( $initial_end );
	$recurrence->setCycletype( $rec['cycle'] );
	if( isset($rec['type']) ) $recurrence->setType( $rec['type'] );
	if( isset($rec['interval']) ) $recurrence->setInterval( (int)$rec['interval'] );
	if( isset($rec['daynumber']) ) $recurrence->setDaynumber( $rec['daynumber'] );
	if( isset($rec['day']) ) $recurrence->setDay( $rec['day'] );
	if( isset($rec['month']) ) $recurrence->setMonth( $rec['month'] );
	if( isset($rec['exclusion'] ) ) $recurrence->setExclusionDates( $rec['exclusion'] );
	$rangetype = $rec['rangetype'];
	if( $rangetype == 'number' ) {
	  $range = (int)$rec['range'];
	} else if( $rangetype == 'date' ) {
	  $range = $this->parseDateTime( $rec['range'] );
	} else {
	  $range = false;
	}
	$recurrence->setRangetype( $rangetype );
	$recurrence->setRange( $range );
	$recurrence->expand( $startstamp, $endstamp );
      } else {
	// Normal event
    
	// Don't bother adding the initial event if it's outside our free/busy window
	if ($initial_start < $startstamp || $initial_end > $endstamp) {
	  continue;
	}
		
	$vFb->addBusyPeriod('BUSY', $initial_start/* + FreeBusy::tzOffset($initial_start)*/, 
			    $initial_end/* + FreeBusy::tzOffset($initial_end)*/, null, $extra);
      }
    }
  
    $xvCal = $vCal;
    $xvCal->addComponent($vFb);
    $vCal->addComponent($this->clearExtra($vFb));
  
    // Generate the vCal file.
    return array( $vCal->exportvCalendar(), $xvCal->exportvCalendar() );
  }

  /********************** Private API below this line ********************/

  function tzOffset( $ts ) {
    $dstr = date('O',$ts);
    return 3600 * substr( $dstr, 0, 3) + 60 * substr( $dstr, 3, 2);
  }

  // static function to compute foldername for imap
  function imapFolderName( $user, $owner, $folder = false, $default_domain = false ) {
    $userdom = false;
    $ownerdom = false;
    if( ereg( '(.*)@(.*)', $user, $regs ) ) {
      // Regular user
      $user = $regs[1];
      $userdom  = $regs[2];
    } else {
      // Domainless user (ie. manager)
    }

    if( ereg( '(.*)@(.*)', $owner, $regs ) ) {      
      $owner = $regs[1];
      $ownerdom = $regs[2];
    } else {
    }

    $fldrcomp = array('user',$owner );
    if( $folder ) $fldrcomp[] = $folder;
    $fldr = join('/', $fldrcomp );
    if( $ownerdom && !$userdom ) $fldr .= '@'.$ownerdom;
    return $fldr;
  }

  // Date/Time value parsing, courtesy of the Horde iCalendar library
  function parseTime($text) {
    // There must be a trailing 'Z' on a time
    if (strlen($text) != 9) {
      return false;
    }

    $time['hour']  = intval(substr($text, 0, 2));
    $time['minute'] = intval(substr($text, 3, 2));
    $time['second']  = intval(substr($text, 6, 2));
    return $time;
  }

  function parseDate($text) {
    if (strlen($text) != 10) {
      return false;
    }
    
    $date['year']  = intval(substr($text, 0, 4));
    $date['month'] = intval(substr($text, 5, 2));
    $date['mday']  = intval(substr($text, 8, 2));
    
    return $date;
  }

  function parseDateTime($text) {
    $dateParts = split('T', $text);
    if (count($dateParts) != 2 && !empty($text)) {
      // Not a datetime field but may be just a date field.
      if (!$date = FreeBusy::parseDate($text)) {
	return $date;
      }
      return @gmmktime(0, 0, 0, $date['month'], $date['mday'], $date['year']);
    }
    
    if (!$date = FreeBusy::parseDate($dateParts[0])) {
      return $date;
    }
    if (!$time = FreeBusy::parseTime($dateParts[1])) {
      return $time;
    }
    
    return @gmmktime($time['hour'], $time['minute'], $time['second'],
                     $date['month'], $date['mday'], $date['year']);
  }

  function getEventHash($xml_text) {
    $xmldoc = @domxml_open_mem($xml_text, DOMXML_LOAD_PARSING +
			       DOMXML_LOAD_COMPLETE_ATTRS + DOMXML_LOAD_SUBSTITUTE_ENTITIES +
			       DOMXML_LOAD_DONT_KEEP_BLANKS, $error);
    
    if (!empty($error)) {
      // There were errors parsing the XML data - abort
      myLog( "Error parsing \"$xml_txt\": $error", RM_LOG_ERROR);
      return false;
    }
    
    $noderoot = $xmldoc->document_element();
    $childnodes = $noderoot->child_nodes();
    
    $event_hash = array();
    
    // Build the event hash
    foreach ($childnodes as $value) {
      //myLog("Looking at tag ".($value->tagname), RM_LOG_DEBUG);
      if( $value->tagname == 'recurrence' ) {
	$rhash = array();
	$attrs = $value->attributes();
	foreach( $attrs as $attr ) {
	  //myLog("getEventHash setting rhash[".$attr->name."] = ".$attr->value, RM_LOG_DEBUG);
	  $rhash[$attr->name] = $attr->value;
	}
	foreach( $value->child_nodes() as $v ) {
	  if( $v->tagname == 'day' || $v->tagname == 'exclusion' ) {
	    $rhash[$v->tagname][] = $v->get_content();
	  } else {
	    $rhash[$v->tagname] = $v->get_content();
	    if( $v->tagname == 'range' && $v->has_attribute('type') ) {
	      $rhash['rangetype'] = $v->get_attribute('type');
	    }
	  }
	}	
	$event_hash[$value->tagname] = $rhash;
      } else {
	$event_hash[$value->tagname] = $value->get_content();
      }
    }
    
    //myLog("RAW Event: ".print_r($event_hash, true), RM_LOG_DEBUG);

    // Perform some sanity checks on the event
    if (
        empty($event_hash['uid']) ||
        empty($event_hash['start-date']) ||
        empty($event_hash['end-date'])
	) {
      return false;
    }
    

    if (empty($event_hash['sensitivity'])) {
      $event_hash['sensitivity'] = 'public';
    }
    
    // Set the summary if it's not present, so we don't get PHP warnings
    // about accessing non-present keys
    if (empty($event_hash['summary'])) {
      $event_hash['summary'] = '';
    }
    
    // Convert our date-time values to timestamps
    if( strpos( $event_hash['start-date'], 'T' ) === false &&
	strpos( $event_hash['end-date'], 'T' ) === false &&
	$event_hash['start-date'] == $event_hash['end-date'] ) {
      $event_hash['allday'] = true;
    } else {
      $event_hash['allday'] = false;      
    }
    $event_hash['start-date'] = FreeBusy::parseDateTime($event_hash['start-date']);
    $event_hash['end-date'] = FreeBusy::parseDateTime($event_hash['end-date']);
    
    return $event_hash;
  }

  function clearExtra( $vFb ) {
    $vFb->_extraParams = array();
    return $vFb;
  }
 
  var $username;
  var $password;
  var $imaphost;
  var $imapport = 143;
  var $foldername;

  // Settings
  var $fbfuture;
  var $fbpast;
  var $default_domain = 'foo';
  var $week_starts_on_sunday = false;

  var $imap;
};

?>

--- NEW FILE: freebusycache.class.php.in ---
<?php
/*
 *  Copyright (c) 2004 Klaraelvdalens Datakonsult AB
 *
 *    Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
 *
 *  This  program is free  software; you can redistribute  it and/or
 *  modify it  under the terms of the GNU  General Public License as
 *  published by the  Free Software Foundation; either version 2, or
 *  (at your option) any later version.
 *
 *  This program is  distributed in the hope that it will be useful,
 *  but WITHOUT  ANY WARRANTY; without even the  implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 *  General Public License for more details.
 *
 *  You can view the  GNU General Public License, online, at the GNU
 *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
 */

/*! To load/store partial freebusy lists
    and their ACLs */
    
require_once('freebusy/misc.php');
require_once('@resmgr_confdir@/freebusy.conf');

class FreeBusyCache {
  function FreeBusyCache( $basedir, $extended = false ) {
    $this->basedir = $basedir;
    $this->extended = $extended;
  }

  function store( $filename, $fbdata, $acl, $relevance ) {
    global $params;
    if( ereg( '\.\.', $filename ) ) {
      $this->error = $filename._(' is not absolute');
      return false;
    }

    $fbfilename = $this->mkfbfilename($filename);
    myLog("FreeBusyCache::store( file=$fbfilename, acl=[ "
	  .str_replace("\n",", ",$this->aclToString($acl))
	  ."], relevance=$relevance )", RM_LOG_DEBUG);
    if( $fbdata === false ) {
      // false data means delete the pfb
      unlink($fbfilename);
      $oldacl = $this->loadACL( $filename );
      $db = dba_open( $this->basedir.'/pfbcache.db', 'cd', $params['dbtype'] );
      if( $db === false ) return false;
      foreach( $oldacl as $ac ) {
	  if( dba_exists( $ac['USER'], $db ) ) {
	    $lst = dba_fetch( $ac['USER'], $db );
	    $lst = $this->decodeList( $lst );
	    $lst = array_diff( $lst, array($fbfilename));
	    myLog("(delete) dba_replace(".$uid.", \"".$this->encodeList($lst)."\")", RM_LOG_DEBUG);
	    dba_replace( $uid, $this->encodeList($lst), $db );
	  }
      }
      unlink($fbfilename.'.acl');
    } else {
      //myLog("Storing $filename with acl ".var_export($acl,true), RM_LOG_DEBUG);
      
      // Create directories if missing
      $fbdirname  = dirname( $fbfilename );
      if (!is_dir($fbdirname)) {
	if( !$this->mkdirhier($fbdirname) ) {
	  $this->error = _("Error creating dir $fbdirname");
	  return false;
	}
      }
      
      // Store the fb list
      $tmpn = tempnam($this->basedir, 'fb');
      $tmpf = fopen($tmpn, 'w');
      if( !$tmpf ) return false;
      fwrite($tmpf, $fbdata);
      if( !rename($tmpn, $fbfilename) ) {
	$this->error = _("Error renaming $tmpn to $fbfilename");
	return false;
      }
      fclose($tmpf);
      
      // Store the ACL
      $oldacl = $this->loadACL( $filename );
      if( !$this->storeACL( $filename, $acl ) ) return false;
      
      // Update overview db
      switch( $relevance ) {
      case 'admins':  $perm = 'a'; break;
      case 'readers': $perm = 'r'; break;
      case 'nobody':  $perm = 'false'; break;
      default: $perm = 'a';
      }

      $db = dba_open( $this->basedir.'/pfbcache.db', 'cd', $params['dbtype'] );
      if( $db === false ) {
	myLog('Unable to open freebusy cache db '.$this->basedir.'/pfbcache.db',
	      RM_LOG_ERROR );
	return false;
      }
      foreach( $acl as $ac ) {
	$uid = $ac['USER'];
	if( dba_exists( $uid, $db ) ) {
	  $lst = dba_fetch( $uid, $db );
	  $lst = $this->decodeList( $lst );
	  $lst = array_diff( $lst, array($filename));
	  dba_replace( $uid, $this->encodeList($lst), $db );
	}
      }
      if( $perm !== false ) {
	foreach( $acl as $ac ) {
	  if( strpos( $ac['RIGHTS'], $perm ) !== false ) {
	    if( dba_exists( $ac['USER'], $db ) ) {
	      $lst = dba_fetch( $ac['USER'], $db );
	      $lst = $this->decodeList( $lst );
	      $lst[] = $filename;
	      dba_replace( $ac['USER'], $this->encodeList(array_unique($lst)), $db );
	    } else {
	      dba_insert( $ac['USER'], $filename, $db );
	    }
	  }
	}
      }
      dba_close($db);
      return true;
    }
  }

  function load( $filename, &$ts, &$acl ) {
    myLog("FreeBusyCache::load( $filename )", RM_LOG_DEBUG);
    $fbfilename = $this->mkfbfilename($filename);
    if( file_exists($fbfilename) ) {
      if( !is_null($ts)) $ts = filectime($fbfilename);
      $acl = $this->loadACL($filename);
      myLog("FreeBusyCache::load(): ts=$ts acl=[ "
	    .str_replace("\n",", ",$this->aclToString($acl))
	    ."] )", RM_LOG_DEBUG);
      return file_get_contents($fbfilename);
    }
    return false;
  }

  function delete( $filename ) {
    global $params;
    $fbfilename = $this->mkfbfilename($filename);
    unlink($fbfilename);
    unlink($this->mkaclfilename($filename));    
    $db = dba_open( $this->basedir.'/pfbcache.db', 'cd', $params['dbtype'] );
    if( $db === false ) return false;
    for( $uid = dba_firstkey($db); $uid !== false; $uid = dba_nextkey($db)) {
      $lst = dba_fetch( $uid, $db );
      $lst = $this->decodeList( $lst );
      $lst = array_diff( $lst, array($filename));
      myLog("(delete) dba_replace(".$uid.", \"".$this->encodeList($lst)."\")", RM_LOG_DEBUG);
      dba_replace( $uid, $this->encodeList($lst), $db );      
    }
    dba_close($db);
  }

  function findAll( $uid, $groups ) {
    global $params;
    $lst = array();
    $db = dba_open( $this->basedir.'/pfbcache.db', 'rd', $params['dbtype'] );
    if( $db === false ) return false;
    $uids = $groups;
    for( $i = 0; $i < count($uids); $i++ ) $uids[$i] = 'group:'.$uids[$i];
    $uids[] = $uid;
    foreach( $uids as $uid ) {
      if( dba_exists( $uid, $db ) ) {
	$tmplst = dba_fetch( $uid, $db );
	myLog("Found ".$uid." := $tmplst", RM_LOG_DEBUG);
	$lst = array_merge( $lst, $this->decodeList( $tmplst ) );
      } else {
	myLog("$uid not found", RM_LOG_DEBUG);	
      }
    }
    dba_close($db);
    $lst = array_unique($lst);
    myLog( "FreeBusyCache::findAll( $uid, [".join(', ', $groups).'] ) = ['.join(', ',$lst).']',
	   RM_LOG_DEBUG );
    return $lst;
  }

  /*************** Private API below this line *************/
  function mkdirhier( $dirname ) {
    $base = substr($dirname,0,strrpos($dirname,'/'));
    if( !empty( $base ) && !is_dir( $base ) ) {
      if( !$this->mkdirhier( $base ) ) return false;
    }
    if( !file_exists( $dirname ) ) return mkdir( $dirname, 0755 );
    return true;
  }

  function mkfbfilename( $fbfilename ) {
    $fbfilename = str_replace( '..', '', $fbfilename );
    $fbfilename = str_replace( "\0", '', $fbfilename );    
    return $this->basedir.'/'.$fbfilename.($this->extended?'.xpfb':'.pfb');
  }

  function mkaclfilename( $fbfilename ) {
    $fbfilename = str_replace( '..', '', $fbfilename );
    $fbfilename = str_replace( "\0", '', $fbfilename );    
    return $this->basedir.'/'.$fbfilename.($this->extended?'.xpfb':'.pfb').'.acl';
  }

  function aclToString( $acl ) {
    $aclstr = '';
    foreach( $acl as $ac ) {
      $aclstr .= $ac['USER'].' '.$ac['RIGHTS']."\n";
    }
    return $aclstr;
  }

  function aclFromString( $aclstr ) {
    $acl = array();
    foreach( split("\n", $aclstr ) as $ac ) {
      if( ereg("(.*) (.*)", $ac, $regs ) ) {
	$acl[] = array('USER' => $regs[1], 'RIGHTS' => $regs[2] );
      }
    }
    return $acl;
  }

  function loadACL( $filename ) {
    return $this->aclFromString( @file_get_contents($this->mkaclfilename($filename)) );    
  }

  function storeACL( $filename, $acl ) {
    $tmpn = tempnam($this->basedir, 'acl');
    $tmpf = fopen($tmpn, 'w');
    if( !$tmpf ) return false;
    fwrite($tmpf, $this->aclToString($acl) );

    $aclfilename = $this->mkaclfilename($filename);
    if( !rename($tmpn, $aclfilename) ) {
      $this->error = _("Error renaming $tmpn to $fbfilename");
      return false;
    }
    fclose($tmpf);    
    return true;
  }

  function aclDiff( $oldacl, $newacl ) {
    $newuids = array();
    foreach( $newacl as $ac ) {
      if( strpos( $ac['RIGHTS'], 'r' ) !== false ) {
	$newuids[$ac['USER']] = true;
      }
    }
    $deleteduids = array();
    foreach( $oldacl as $ac ) {
      if( !$newuids[$ac['USER']] ) $deleteduids[] = $ac['USER'];
    }
    return $deleteduids;
  }

  /** Returns an array with cyrus permission chars (lrsp...) as keys */
  function getRights( $acl, $uid, $groups ) {
    if( !isset($uid) ) return false;
    if( is_array( $groups ) ) $uids = $groups;
    else $uids = array();
    for( $i = 0; $i < count($uids); $i++ ) $uids[$i] = 'group:'.$uids[$i];
    $uids[] = $uid;
    $rights = array();
    $negacl = array();

    // Calc positive rights
    foreach( $acl as $ac ) {
      $r = $ac['RIGHTS'];
      $u = $ac['USER'];
      if( $r{0} == '-' ) {
	$negacl[] = array( 'USER' => $u, 'RIGHTS' => $r );
	continue;
      }
      if( in_array( $u, $uids ) ) {
	for( $i = 0; $i < strlen($r); $i++ ) {
	  $rights[$r{$i}] = true;
	}
      }
    }
    
    // Remove negative rights
    foreach( $negacl as $ac ) {
      $r = $ac['RIGHTS'];
      $u = $ac['USER'];
      if( in_array( $u, $uids ) ) {
	for( $i = 1; $i < strlen($r); $i++ ) {
	  unset($rights[$r{$i}]);
	}
      }
    }
    return $rights;
  }

  function decodeList( $str ) {
    return split( ',', $str );
  }
  function encodeList( $lst ) {
    return join(',',$lst);
  }

  function recursivedir( $dir ) {
    $dh = opendir( $dir );
    if( $dh === false ) return false;
    $dirs = array();
    while (($file = readdir($dh)) !== false) {
      if( is_dir($dir.'/'.$file) ) {
	if($file=='.' || $file=='..') continue;
	if( !ereg( ($this->extended?'/.*\.xpfb$/':'/.*\.pfb$/'), $file ) ) continue;
	$tmp = $this->recursivedir( $dir.'/'.$file );
	if( $tmp !== false ) $dirs = array_merge( $dirs, $tmp );
      } else if( is_file($dir.'/'.$file) ) {
	$dirs[] = $dir.'/'.$file;
      }
    }
    closedir( $dh );
    return $dirs;
  }

  var $basedir;
  var $error;
};

?>


--- freebusy.class.php DELETED ---

--- freebusycache.class.php DELETED ---



From cvs at intevation.de  Sun Feb  5 21:02:04 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  5 Feb 2006 21:02:04 +0100 (CET)
Subject: richard: server/kolab-resource-handlers/kolab-resource-handlers
	ChangeLog, 1.10, 1.11 
Message-ID: <20060205200204.E70FE1006B0@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
Use the new kolab_php_module_prefix variable



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ChangeLog	14 Jan 2006 22:16:56 -0000	1.10
+++ ChangeLog	5 Feb 2006 20:02:02 -0000	1.11
@@ -1,3 +1,10 @@
+2006-02-05 Richard Bos <richard at radoeka.nl>
+	* freebusy/freebusycache.class.php, freebusy/freebusy.class.php,
+	  resmgr/resmgr.php, resmgr/olhacks.php: removed
+	* freebusy/freebusycache.class.php.in, freebusy/freebusy.class.php.in,
+	  resmgr/resmgr.php.in, resmgr/olhacks.php.in: added.  Use the
+	  new kolab_php_module_prefix variable
+
 2006-01-14 Marcus Hüwe <suse-tux at gmx.de>
 	Patch commited by Richard Bos
 	* configure.ac: replaced --enable-dist with --with-dist



From cvs at intevation.de  Sun Feb  5 21:02:05 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  5 Feb 2006 21:02:05 +0100 (CET)
Subject: richard: server/kolab-resource-handlers/kolab-resource-handlers/resmgr
	olhacks.php.in, NONE, 1.1 resmgr.php.in, NONE, 1.1 olhacks.php,
	1.8, NONE resmgr.php, 1.73, NONE 
Message-ID: <20060205200205.064381006B2@lists.intevation.de>

Author: richard

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

Added Files:
	olhacks.php.in resmgr.php.in 
Removed Files:
	olhacks.php resmgr.php 
Log Message:
Use the new kolab_php_module_prefix variable



--- NEW FILE: olhacks.php.in ---
<?php
/*
 *  Copyright (c) 2004 Klaraelvdalens Datakonsult AB
 *
 *    Writen by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
 *
 *  This  program is free  software; you can redistribute  it and/or
 *  modify it  under the terms of the GNU  General Public License as
 *  published by the  Free Software Foundation; either version 2, or
 *  (at your option) any later version.
 *
 *  This program is  distributed in the hope that it will be useful,
 *  but WITHOUT  ANY WARRANTY; without even the  implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 *  General Public License for more details.
 *
 *  You can view the  GNU General Public License, online, at the GNU
 *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
 */

require_once 'kolabfilter/misc.php';
require_once HORDE_BASE . '/lib/core.php';
require_once 'Horde/iCalendar.php';
require_once 'Horde/NLS.php';
require_once 'Horde/MIME.php';
require_once 'Horde/MIME/Message.php';
require_once 'Horde/MIME/Headers.php';
require_once 'Horde/MIME/Part.php';
require_once 'Horde/MIME/Structure.php';

$forwardtext = "This is an invitation forwarded by outlook and\n".
  "was rectified by the Kolab server.\n".
  "The invitation was originally sent by\n%s.\n\n".
  "Diese Einladung wurde von Outlook weitergeleitet\n".
  "und vom Kolab-Server in gute Form gebracht.\n".
  "Die Einladung wurde ursprünglich von\n%s geschickt.\n";

/*static*/ function olhacks_mime_parse( &$text ) {
  /* Taken from Horde's MIME/Structure.php */
  require_once 'Mail/mimeDecode.php';

  /* Set up the options for the mimeDecode class. */
  $decode_args = array();
  $decode_args['include_bodies'] = true;
  $decode_args['decode_bodies'] = false;
  $decode_args['decode_headers'] = false;
  
  $mimeDecode = &new Mail_mimeDecode($text, MIME_PART_EOL);
  if (!($structure = $mimeDecode->decode($decode_args))) {
    return false;
  }
  
  /* Put the object into imap_parsestructure() form. */
  MIME_Structure::_convertMimeDecodeData($structure);
  
  return array($structure->headers, $ret = &MIME_Structure::parse($structure));
}

/* static */ function copy_header( $name, &$msg_headers, &$headerarray ) {
  $lname = strtolower($name);
  if( array_key_exists($lname, $headerarray)) {
    if( is_array( $headerarray[$lname] ) ) {
      foreach( $headerarray[$lname] as $h ) {
	$msg_headers->addHeader($name, $h );	
      }
    } else {
      $msg_headers->addHeader($name, $headerarray[$lname] );
    }
  }
}

/*
 * Yet another problem: Outlook seems to remove the organizer
 * from the iCal when forwarding -- we put the original sender
 * back in as organizer.
 */
/* static */ function add_organizer( &$icaltxt, $from ) {
  global $params;
  $iCal = &new Horde_iCalendar();
  $iCal->parsevCalendar($icaltxt);
  $vevent =& $iCal->findComponent('VEVENT');
  if( $vevent ) {
    #myLog("Successfully parsed vevent", RM_LOG_DEBUG);
    if( !$vevent->organizerName() ) {
      #myLog("event has no organizer, adding $from", RM_LOG_DEBUG);
      $adrs = imap_rfc822_parse_adrlist($from, $params['email_domain']);
      if( count($adrs) > 0 ) {
	$org_email = 'mailto:'.$adrs[0]->mailbox.'@'.$adrs[0]->host;
	$org_name  = $adrs[0]->personal;
	if( $org_name ) $vevent->setAttribute( 'ORGANIZER', $org_email, 
					       array( 'CN' => $org_name), false );
	else $vevent->setAttribute( 'ORGANIZER', $org_email, 
				    array(), false );
	myLog("Adding missing organizer '$org_name <$org_email>' to iCal", RM_LOG_DEBUG);
	$icaltxt = $iCal->exportvCalendar();
      }
    }
  }
}

/* Yet another Outlook problem: Some versions of Outlook seems to be incapable
 * of handling non-ascii characters properly in text/calendar parts of
 * a multi-part/mixed mail which we use for forwarding.
 * As a solution, we encode common characters as humanreadable
 * two-letter ascii.
 */
/* static */ function olhacks_recode_to_ascii( $text ) {
  #myLog("recoding \"$text\"", RM_LOG_DEBUG);
  $text = str_replace( ('æ'), 'ae', $text );
  $text = str_replace( ('ø'), 'oe', $text );
  $text = str_replace( ('Ã¥'), 'aa', $text );
  $text = str_replace( ('ä'), 'ae', $text );
  $text = str_replace( ('ö'), 'oe', $text );
  $text = str_replace( ('ü'), 'ue', $text );
  $text = str_replace( ('ß'), 'ss', $text );

  $text = str_replace( ('Æ'), 'Ae', $text );
  $text = str_replace( ('Ø'), 'Oe', $text );
  $text = str_replace( ('Ã…'), 'Aa', $text );
  $text = str_replace( ('Ä'), 'Ae', $text );
  $text = str_replace( ('Ö'), 'Oe', $text );
  $text = str_replace( ('Ü'), 'Ue', $text );
  #myLog("recoded to \"$text\"", RM_LOG_DEBUG);

  return $text;
}

/* main entry point */
function olhacks_embedical( $fqhostname, $sender, $recipients, $origfrom, $subject, $tmpfname ) {
  myLog("Encapsulating iCal message forwarded by $sender", RM_LOG_DEBUG);
  global $forwardtext;
  // Read in message text
  $requestText = '';
  $handle = @fopen( $tmpfname, "r" );
  if( $handle === false ) {
    myLog("Error opening $tmpfname", RM_LOG_ERROR);
    return false;
  }
  while (!feof($handle)) {
    $requestText .= fread($handle, 8192);
  }
  fclose($handle);

  // Parse existing message
  list( $headers, $mime) = olhacks_mime_parse($requestText);
  $parts = $mime->contentTypeMap();
  if( count($parts) != 1 || $parts[1] != 'text/calendar' ) {
    myLog("Message does not contain exactly one toplevel text/calendar part, passing through", 
	  RM_LOG_DEBUG);
    return false;
  }
  $basepart = $mime->getBasePart();

  // Construct new MIME message with original message attached
  $toppart = &new MIME_Message();
  $dorigfrom = Mail_mimeDecode::_decodeHeader($origfrom);
  $textpart = &new MIME_Part('text/plain', sprintf($forwardtext,$dorigfrom,$dorigfrom), 'UTF-8' );
  $ical_txt = $basepart->transferDecode();
  add_organizer($ical_txt, $dorigfrom);
  $msgpart = &new MIME_Part($basepart->getType(), olhacks_recode_to_ascii($ical_txt), 
			    $basepart->getCharset() );
  
  $toppart->addPart($textpart);
  $toppart->addPart($msgpart);
  
  // Build the reply headers.
  $msg_headers = &new MIME_Headers();
  copy_header( 'Received', $msg_headers, $headers );
  //$msg_headers->addReceivedHeader();
  $msg_headers->addMessageIdHeader();
  //myLog("Headers=".print_r($headers,true), RM_LOG_DEBUG);
  copy_header( 'Date', $msg_headers, $headers );
  copy_header( 'Resent-Date', $msg_headers, $headers );
  copy_header( 'Subject', $msg_headers, $headers );
  $msg_headers->addHeader('From', $sender);
  foreach( $recipients as $recip ) {
    $msg_headers->addHeader('To', $recip);
  }
  $msg_headers->addHeader('X-Kolab-Forwarded', 'TRUE');
  $msg_headers->addMIMEHeaders($toppart);
  copy_header( 'Content-Transfer-Encoding', $msg_headers, $headers );

  if (is_object($msg_headers)) {
    $headerArray = $toppart->encode($msg_headers->toArray(), $toppart->getCharset());
  } else {
    $headerArray = $toppart->encode($msg_headers, $toppart->getCharset());
  }

  // Inject message back into postfix
  require_once 'Mail.php';
  $mailer = &Mail::factory('SMTP', array('auth' => false, 'port' => 10026 ));

  $msg = $toppart->toString();
  /* Make sure the message has a trailing newline. */
  if (substr($msg, -1) != "\n") {
    $msg .= "\n";
  }

  $error = $mailer->send($recipients, $headerArray, $msg);
  if( PEAR::isError($error) ) {
    fwrite(STDOUT, $error->getMessage()."\n"); exit(EX_TEMPFAIL);
  }

  return true;
}

?>

--- NEW FILE: resmgr.php.in ---
<?php
/*
 *  Copyright (c) 2004 Klaraelvdalens Datakonsult AB
 *
 *    Writen by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
 *
 *  This  program is free  software; you can redistribute  it and/or
 *  modify it  under the terms of the GNU  General Public License as
 *  published by the  Free Software Foundation; either version 2, or
 *  (at your option) any later version.
 *
 *  This program is  distributed in the hope that it will be useful,
 *  but WITHOUT  ANY WARRANTY; without even the  implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 *  General Public License for more details.
 *
 *  You can view the  GNU General Public License, online, at the GNU
 *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
 */
[...1338 lines suppressed...]
    // once more so it is up to date
    if( !triggerFreeBusy($resource,false) ) {
      myLog("Error updating fblist", RM_LOG_SUPER );
    }
    return false;;

  default:
    // We either don't currently handle these iTip methods, or they do not
    // apply to what we're trying to accomplish here
    if (!$params['group']) {
      myLog("Ignoring $method method");
      return false;
    }
  }

  // Pass the message through to the group's mailbox
  myLog("Passing through $method method to $resource");
  return true;
}
?>

--- olhacks.php DELETED ---

--- resmgr.php DELETED ---



From cvs at intevation.de  Sun Feb  5 21:10:10 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  5 Feb 2006 21:10:10 +0100 (CET)
Subject: richard: server/kolab-resource-handlers/kolab-resource-handlers
	ChangeLog, 1.11, 1.12 
Message-ID: <20060205201010.B0B761005C5@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
Add Makefile.am

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ChangeLog	5 Feb 2006 20:02:02 -0000	1.11
+++ ChangeLog	5 Feb 2006 20:10:08 -0000	1.12
@@ -4,6 +4,7 @@
 	* freebusy/freebusycache.class.php.in, freebusy/freebusy.class.php.in,
 	  resmgr/resmgr.php.in, resmgr/olhacks.php.in: added.  Use the
 	  new kolab_php_module_prefix variable
+	* Makefile.am: reflect the changes in the above mentioned files
 
 2006-01-14 Marcus Hüwe <suse-tux at gmx.de>
 	Patch commited by Richard Bos



From cvs at intevation.de  Sun Feb  5 21:13:57 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  5 Feb 2006 21:13:57 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.19,
	1.20 Makefile.am, 1.33, 1.34 
Message-ID: <20060205201357.24AC91005C5@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Use the new kolab_php_module_prefix variable



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- ChangeLog	18 Jan 2006 19:35:17 -0000	1.19
+++ ChangeLog	5 Feb 2006 20:13:55 -0000	1.20
@@ -1,3 +1,38 @@
+2006-02-05 Richard Bos <richard at radoeka.nl>
+	* www/admin/addressbook/addr.php, www/admin/addressbook/index.php,
+	  www/admin/administrator/admin.php, www/admin/administrator/index.php,
+	  www/admin/distributionlist/index.php,
+	  www/admin/distributionlist/list.php,
+	  www/admin/domainmaintainer/domainmaintainer.php,
+	  www/admin/domainmaintainer/index.php, www/admin/index.php,
+	  www/admin/kolab/codefusion.php, www/admin/kolab/erfrakon.php,
+	  www/admin/kolab/index.php, www/admin/kolab/intevation.php,
+	  www/admin/kolab/kdab.php, www/admin/kolab/kde.php,
+	  www/admin/maintainer/index.php, www/admin/maintainer/maintainer.php,
+	  www/admin/service/index.php, www/admin/sharedfolder/index.php,
+	  www/admin/sharedfolder/sf.php, www/admin/user/deliver.php,
+	  www/admin/user/forward.php, www/admin/user/index.php,
+	  www/admin/user/vacation.php, php/admin/include/mysmarty.php: removed
+	* www/admin/addressbook/addr.php.in, www/admin/addressbook/index.php.in,
+	  www/admin/administrator/admin.php.in,
+	  www/admin/administrator/index.php.in,
+	  www/admin/distributionlist/index.php.in,
+	  www/admin/distributionlist/list.php.in,
+	  www/admin/domainmaintainer/domainmaintainer.php.in,
+	  www/admin/domainmaintainer/index.php.in, www/admin/index.php.in,
+	  www/admin/kolab/codefusion.php.in, www/admin/kolab/erfrakon.php.in,
+	  www/admin/kolab/index.php.in, www/admin/kolab/intevation.php.in,
+	  www/admin/kolab/kdab.php.in, www/admin/kolab/kde.php.in,
+	  www/admin/maintainer/index.php.in,
+	  www/admin/maintainer/maintainer.php.in,
+	  www/admin/service/index.php.in, www/admin/sharedfolder/index.php.in,
+	  www/admin/sharedfolder/sf.php.in, www/admin/user/deliver.php.in,
+	  www/admin/user/forward.php.in, www/admin/user/index.php.in,
+	  www/admin/user/vacation.php.in,
+	  php/admin/include/mysmarty.php.in: added.  Use the new build
+	  variable: kolab_php_module_prefix variable.
+	* Makefile.am: reflect the changes in the above mentioned files.
+
 2006-01-17 Richard Bos <richard at radoeka.nl>
 	* Makefile.am: corrected make rule for php/admin/templates/versions.tpl
 

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- Makefile.am	18 Jan 2006 19:35:17 -0000	1.33
+++ Makefile.am	5 Feb 2006 20:13:55 -0000	1.34
@@ -19,49 +19,49 @@
 	www/admin/style.css 
 
 wskolabdir = $(webserver_document_root)$(webserver_web_prefix)/admin
-dist_wskolab_DATA = $(WSKOLAB_FILES)
+wskolab_DATA = $(WSKOLAB_FILES)
+EXTRA_DIST += www/admin/style.css
 
 WSADDRESSBOOK_FILES = www/admin/addressbook/addr.php \
 	www/admin/addressbook/index.php
 
 wsaddressbookdir   = $(wskolabdir)/addressbook
-dist_wsaddressbook_DATA = $(WSADDRESSBOOK_FILES)
+wsaddressbook_DATA = $(WSADDRESSBOOK_FILES)
 
 WSADMINISTRATOR_FILES = www/admin/administrator/admin.php \
 	www/admin/administrator/index.php
 
 wsadminstratordir = $(wskolabdir)/administrator
-dist_wsadminstrator_DATA = $(WSADMINISTRATOR_FILES)
+wsadminstrator_DATA = $(WSADMINISTRATOR_FILES)
 
 WSDISTRIBUTIONLIST_FILES = www/admin/distributionlist/index.php \
 	www/admin/distributionlist/list.php
 
 wsdistributionlistdir = $(wskolabdir)/distributionlist
-dist_wsdistributionlist_DATA = $(WSDISTRIBUTIONLIST_FILES)
+wsdistributionlist_DATA = $(WSDISTRIBUTIONLIST_FILES)
 
 WSABOUT_FILES = www/admin/kolab/erfrakon.php \
 	www/admin/kolab/index.php \
 	www/admin/kolab/intevation.php \
 	www/admin/kolab/codefusion.php \
 	www/admin/kolab/kdab.php \
-	www/admin/kolab/kde.php
+	www/admin/kolab/kde.php \
+	www/admin/kolab/versions.php
 
 wsaboutdir = $(wskolabdir)/kolab
-wsabout_DATA = $(WSABOUT_FILES) \
-	www/admin/kolab/versions.php
-EXTRA_DIST += $(WSABOUT_FILES)
+wsabout_DATA = $(WSABOUT_FILES)
 
 WSMAINTAINER_FILES = www/admin/maintainer/maintainer.php \
 	www/admin/maintainer/index.php
 
 wsmaintainerdir = $(wskolabdir)/maintainer
-dist_wsmaintainer_DATA = $(WSMAINTAINER_FILES)
+wsmaintainer_DATA = $(WSMAINTAINER_FILES)
 
 WSDOMAINMAINTAINER_FILES = www/admin/domainmaintainer/domainmaintainer.php \
 	www/admin/domainmaintainer/index.php
 
 wsdomainmaintainerdir = $(wskolabdir)/domainmaintainer
-dist_wsdomainmaintainer_DATA = $(WSDOMAINMAINTAINER_FILES)
+wsdomainmaintainer_DATA = $(WSDOMAINMAINTAINER_FILES)
 
 WSPICS_FILES = www/admin/pics/erfrakon.png \
 	www/admin/pics/codefusion.png \
@@ -74,13 +74,13 @@
 dist_wspics_DATA = $(WSPICS_FILES)
 
 wsservicedir = $(wskolabdir)/service
-dist_wsservice_DATA = www/admin/service/index.php
+wsservice_DATA = www/admin/service/index.php
 
 WSSHAREDFOLDER_FILES = www/admin/sharedfolder/sf.php \
 	www/admin/sharedfolder/index.php
 
 wssharedfolderdir = $(wskolabdir)/sharedfolder
-dist_wssharedfolder_DATA = $(WSSHAREDFOLDER_FILES)
+wssharedfolder_DATA = $(WSSHAREDFOLDER_FILES)
 
 WSUSER_FILES = www/admin/user/forward.php \
 	www/admin/user/index.php \
@@ -89,16 +89,9 @@
 	www/admin/user/deliver.php
 
 wsuserdir = $(wskolabdir)/user
-dist_wsuser_DATA = $(WSUSER_FILES)
-
-phpkolabdir = $(phplibdir2)/admin
-
-php/admin/include/config.php: Makefile php/admin/include/config.php.in
-	$(mkinstalldirs) php/admin/include
-	$(do_subst) <$(srcdir)/php/admin/include/config.php.in >$@
+wsuser_DATA = $(WSUSER_FILES)
 
-CLEANFILES += php/admin/include/config.php
-EXTRA_DIST += php/admin/include/config.php.in
+phpkolabdir = $(phplibdir2)/$(kolab_php_module_prefix)admin
 
 php_includes_configdir = $(phpkolabdir)/include
 php_includes_config_DATA = php/admin/include/config.php
@@ -106,17 +99,18 @@
 PHP_INCLUDES = php/admin/include/menu.php \
 	php/admin/include/debug.php \
 	php/admin/include/form.class.php \
-	php/admin/include/auth.class.php \
 	php/admin/include/ldap.class.php \
 	php/admin/include/sieveutils.class.php \
-	php/admin/include/mysmarty.php \
-	php/admin/include/headers.php \
 	php/admin/include/authenticate.php \
 	php/admin/include/locale.php \
 	php/admin/include/Sieve.php
 
 phpincludesdir = $(phpkolabdir)/include
-dist_phpincludes_DATA = $(PHP_INCLUDES)
+phpincludes_DATA = $(PHP_INCLUDES) \
+	php/admin/include/auth.class.php \
+	php/admin/include/headers.php \
+	php/admin/include/mysmarty.php 
+EXTRA_DIST += $(PHP_INCLUDES)
 
 PHP_TEMPLATES = php/admin/templates/maintainerdeleted.tpl \
 	php/admin/templates/kde.tpl \
@@ -202,17 +196,176 @@
 	dist_conf/mandriva \
 	dist_conf/suse
 
+### new
+
+www/admin/addressbook/addr.php:
+	@$(mkinstalldirs) www/admin/addressbook
+	$(do_subst) <$(srcdir)/www/admin/addressbook/addr.php.in >$@
+CLEANFILES += www/admin/addressbook/addr.php
+EXTRA_DIST += www/admin/addressbook/addr.php.in
+
+www/admin/addressbook/index.php:
+	@$(mkinstalldirs) www/admin/addressbook
+	$(do_subst) <$(srcdir)/www/admin/addressbook/index.php.in >$@
+CLEANFILES += www/admin/addressbook/index.php
+EXTRA_DIST += www/admin/addressbook/index.php.in
+
+www/admin/administrator/admin.php:
+	@$(mkinstalldirs) www/admin/administrator
+	$(do_subst) <$(srcdir)/www/admin/administrator/admin.php.in >$@
+CLEANFILES += www/admin/administrator/admin.php
+EXTRA_DIST += www/admin/administrator/admin.php.in
+
+www/admin/administrator/index.php:
+	@$(mkinstalldirs) www/admin/administrator
+	$(do_subst) <$(srcdir)/www/admin/administrator/index.php.in >$@
+CLEANFILES += www/admin/administrator/index.php
+EXTRA_DIST += www/admin/administrator/index.php.in
+
+www/admin/distributionlist/index.php:
+	@$(mkinstalldirs) www/admin/distributionlist
+	$(do_subst) <$(srcdir)/www/admin/distributionlist/index.php.in >$@
+CLEANFILES += www/admin/distributionlist/index.php
+EXTRA_DIST += www/admin/distributionlist/index.php.in
+
+www/admin/distributionlist/list.php:
+	@$(mkinstalldirs) www/admin/distributionlist
+	$(do_subst) <$(srcdir)/www/admin/distributionlist/list.php.in >$@
+CLEANFILES += www/admin/distributionlist/list.php
+EXTRA_DIST += www/admin/distributionlist/list.php.in
+
+www/admin/domainmaintainer/domainmaintainer.php:
+	@$(mkinstalldirs) www/admin/domainmaintainer
+	$(do_subst) <$(srcdir)/www/admin/domainmaintainer/domainmaintainer.php.in >$@
+CLEANFILES += www/admin/domainmaintainer/domainmaintainer.php
+EXTRA_DIST += www/admin/domainmaintainer/domainmaintainer.php.in
+
+www/admin/domainmaintainer/index.php:
+	@$(mkinstalldirs) www/admin/domainmaintainer
+	$(do_subst) <$(srcdir)/www/admin/domainmaintainer/index.php.in >$@
+CLEANFILES += www/admin/domainmaintainer/index.php
+EXTRA_DIST += www/admin/domainmaintainer/index.php.in
+
+www/admin/index.php:
+	@$(mkinstalldirs) www/admin
+	$(do_subst) <$(srcdir)/www/admin/index.php.in >$@
+CLEANFILES += www/admin/index.php
+EXTRA_DIST += www/admin/index.php.in
+
+www/admin/kolab/codefusion.php:
+	@$(mkinstalldirs) www/admin/kolab
+	$(do_subst) <$(srcdir)/www/admin/kolab/codefusion.php.in >$@
+CLEANFILES += www/admin/kolab/codefusion.php
+EXTRA_DIST += www/admin/kolab/codefusion.php.in
+
+www/admin/kolab/erfrakon.php:
+	@$(mkinstalldirs) www/admin/kolab
+	$(do_subst) <$(srcdir)/www/admin/kolab/erfrakon.php.in >$@
+CLEANFILES += www/admin/kolab/erfrakon.php
+EXTRA_DIST += www/admin/kolab/erfrakon.php.in
+
+www/admin/kolab/index.php:
+	@$(mkinstalldirs) www/admin/kolab
+	$(do_subst) <$(srcdir)/www/admin/kolab/index.php.in >$@
+CLEANFILES += www/admin/kolab/index.php
+EXTRA_DIST += www/admin/kolab/index.php.in
+
+www/admin/kolab/intevation.php:
+	@$(mkinstalldirs) www/admin/kolab
+	$(do_subst) <$(srcdir)/www/admin/kolab/intevation.php.in >$@
+CLEANFILES += www/admin/kolab/intevation.php
+EXTRA_DIST += www/admin/kolab/intevation.php.in
+
+www/admin/kolab/kdab.php:
+	@$(mkinstalldirs) www/admin/kolab
+	$(do_subst) <$(srcdir)/www/admin/kolab/kdab.php.in >$@
+CLEANFILES += www/admin/kolab/kdab.php
+EXTRA_DIST += www/admin/kolab/kdab.php.in
+
+www/admin/kolab/kde.php:
+	@$(mkinstalldirs) www/admin/kolab
+	$(do_subst) <$(srcdir)/www/admin/kolab/kde.php.in >$@
+CLEANFILES += www/admin/kolab/kde.php
+EXTRA_DIST += www/admin/kolab/kde.php.in
+
+www/admin/maintainer/index.php:
+	@$(mkinstalldirs) www/admin/maintainer
+	$(do_subst) <$(srcdir)/www/admin/maintainer/index.php.in >$@
+CLEANFILES += www/admin/maintainer/index.php
+EXTRA_DIST += www/admin/maintainer/index.php.in
+
+www/admin/maintainer/maintainer.php:
+	@$(mkinstalldirs) www/admin/maintainer
+	$(do_subst) <$(srcdir)/www/admin/maintainer/maintainer.php.in >$@
+CLEANFILES += www/admin/maintainer/maintainer.php
+EXTRA_DIST += www/admin/maintainer/maintainer.php.in
+
+www/admin/service/index.php:
+	@$(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/sharedfolder/index.php:
+	@$(mkinstalldirs) www/admin/sharedfolder
+	$(do_subst) <$(srcdir)/www/admin/sharedfolder/index.php.in >$@
+CLEANFILES += www/admin/sharedfolder/index.php
+EXTRA_DIST += www/admin/sharedfolder/index.php.in
+
+www/admin/sharedfolder/sf.php:
+	@$(mkinstalldirs) www/admin/sharedfolder
+	$(do_subst) <$(srcdir)/www/admin/sharedfolder/sf.php.in >$@
+CLEANFILES += www/admin/sharedfolder/sf.php
+EXTRA_DIST += www/admin/sharedfolder/sf.php.in
+
+www/admin/user/deliver.php:
+	@$(mkinstalldirs) www/admin/user
+	$(do_subst) <$(srcdir)/www/admin/user/deliver.php.in >$@
+CLEANFILES += www/admin/user/deliver.php
+EXTRA_DIST += www/admin/user/deliver.php.in
+
+www/admin/user/forward.php:
+	@$(mkinstalldirs) www/admin/user
+	$(do_subst) <$(srcdir)/www/admin/user/forward.php.in >$@
+CLEANFILES += www/admin/user/forward.php
+EXTRA_DIST += www/admin/user/forward.php.in
+
+www/admin/user/index.php:
+	@$(mkinstalldirs) www/admin/user
+	$(do_subst) <$(srcdir)/www/admin/user/index.php.in >$@
+CLEANFILES += www/admin/user/index.php
+EXTRA_DIST += www/admin/user/index.php.in
+
+www/admin/user/vacation.php:
+	@$(mkinstalldirs) www/admin/user
+	$(do_subst) <$(srcdir)/www/admin/user/vacation.php.in >$@
+CLEANFILES += www/admin/user/vacation.php
+EXTRA_DIST += www/admin/user/vacation.php.in
+###
+
 php/admin/include/auth.class.php:
 	@$(mkinstalldirs) php/admin/include
 	$(do_subst) <$(srcdir)/php/admin/include/auth.class.php.in >$@
 CLEANFILES += php/admin/include/auth.class.php
 EXTRA_DIST += php/admin/include/auth.class.php.in
 
+php/admin/include/config.php: Makefile php/admin/include/config.php.in
+	$(mkinstalldirs) php/admin/include
+	$(do_subst) <$(srcdir)/php/admin/include/config.php.in >$@
+CLEANFILES += php/admin/include/config.php
+EXTRA_DIST += php/admin/include/config.php.in
+
 php/admin/include/headers.php:
 	@$(mkinstalldirs) php/admin/include
 	$(do_subst) <$(srcdir)/php/admin/include/headers.php.in >$@
 CLEANFILES += php/admin/include/headers.php
 EXTRA_DIST += php/admin/include/headers.php.in
+
+php/admin/include/mysmarty.php:
+	@$(mkinstalldirs) php/admin/include
+	$(do_subst) <$(srcdir)/php/admin/include/mysmarty.php.in >$@
+CLEANFILES += php/admin/include/mysmarty.php
+EXTRA_DIST += php/admin/include/mysmarty.php.in
 
 php/admin/templates/page.tpl:
 	@$(mkinstalldirs) php/admin/templates



From cvs at intevation.de  Sun Feb  5 21:13:57 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  5 Feb 2006 21:13:57 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/include
	mysmarty.php.in, 1.6, 1.7 config.php.in, 1.2, 1.3 mysmarty.php,
	1.13, NONE 
Message-ID: <20060205201357.2C79B1006B0@lists.intevation.de>

Author: richard

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

Modified Files:
	config.php.in 
Added Files:
	mysmarty.php.in 
Removed Files:
	mysmarty.php 
Log Message:
Use the new kolab_php_module_prefix variable




Index: config.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/config.php.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- config.php.in	27 Nov 2005 13:48:36 -0000	1.2
+++ config.php.in	5 Feb 2006 20:13:55 -0000	1.3
@@ -18,10 +18,10 @@
  *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
  */
 
-$topdir = '/admin';
+$topdir = '/@kolab_php_module_prefix at admin';
 $kolab_prefix = '@prefix@';
 $php_dir      = '@phplibdir2@';
-$locale_dir   = "$php_dir/admin/locale/";
+$locale_dir   = "$php_dir/@kolab_php_module_prefix at admin/locale/";
 
 /*
   Local variables:
@@ -32,4 +32,4 @@
   End:
   vim:encoding=utf-8:
  */
-?>
\ No newline at end of file
+?>

--- mysmarty.php DELETED ---



From cvs at intevation.de  Sun Feb  5 21:13:57 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  5 Feb 2006 21:13:57 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/www/admin index.php.in,
	NONE, 1.1 index.php, 1.8, NONE 
Message-ID: <20060205201357.2F85D1006B2@lists.intevation.de>

Author: richard

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

Added Files:
	index.php.in 
Removed Files:
	index.php 
Log Message:
Use the new kolab_php_module_prefix variable



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

--- index.php DELETED ---



From cvs at intevation.de  Sun Feb  5 21:13:57 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  5 Feb 2006 21:13:57 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/www/admin/addressbook
	addr.php.in, NONE, 1.1 index.php.in, NONE, 1.1 addr.php, 1.14,
	NONE index.php, 1.8, NONE 
Message-ID: <20060205201357.34A351006B3@lists.intevation.de>

Author: richard

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

Added Files:
	addr.php.in index.php.in 
Removed Files:
	addr.php index.php 
Log Message:
Use the new kolab_php_module_prefix variable



--- NEW FILE: addr.php.in ---
<?php
require_once('@kolab_php_module_prefix at admin/include/mysmarty.php');
require_once('@kolab_php_module_prefix at admin/include/headers.php');
require_once('@kolab_php_module_prefix at admin/include/locale.php');
require_once('@kolab_php_module_prefix at admin/include/authenticate.php');
require_once('@kolab_php_module_prefix at admin/include/form.class.php');


/**** Authentication etc. ***/
$errors = array();
$messages = array();
$sidx = 'addressbook';
$contenttemplate = 'formcontainer.tpl';
$valid_actions = array('firstsave','save','modify','create','delete','kill');

if( $auth->group() != 'maintainer' && $auth->group() != 'admin') {
   array_push($errors, _("Error: You don't have Permissions to access this Menu") );
}

require_once('@kolab_php_module_prefix at admin/include/menu.php');

function fill_form_for_modify( &$form, &$ldap_object ) {
  if (is_array($ldap_object['sn'])) $lastname = $ldap_object['sn'][0];
  else $lastname = $ldap_object['sn'];
  if (is_array($ldap_object['cn'])) $cn = $ldap_object['cn'][0];
  else $cn = $ldap_object['cn'];
  if ($lastname) {
    $a = strlen($lastname);
    if ($cn) {
      $b = strlen($cn);
      $firstname = trim(substr($cn, 0, $b - $a));
    }
  }
  if (is_array($ldap_object['mail'])) $mail_0 = $ldap_object['mail'][0];
  else $mail_0 = $ldap_object['mail'];
  $form->entries['firstname']['value'] = $firstname;
  $form->entries['lastname']['value'] = $lastname;
  $form->entries['mail']['value'] = $mail_0;

  foreach( array( 'title', 'o', 'ou', 'roomNumber', 'street', 'postOfficeBox',
                  'postalCode', 'l', 'c', 'telephoneNumber',
                  'facsimileTelephoneNumber' ) as $attr ) {	
    if (is_array($ldap_object[strtolower($attr)])) $v = $ldap_object[strtolower($attr)][0];
    else $v = $ldap_object[strtolower($attr)];
    $form->entries[$attr]['value'] = $v;
  }
  if (is_array($ldap_object['alias'])) {
	$arr = $ldap_object['alias'];
	unset( $arr['count'] );
	$v = join("\n", $arr );
  }
  else $v = $ldap_object['alias'];
  $form->entries['alias']['value'] = $v;
  $form->entries['action']['value'] = 'save';
}

$dn="";
if (!empty($_REQUEST['dn'])) $dn = trim($_REQUEST['dn']);

function checkuniquemail( $form, $key, $value ) {
  global $ldap;
  global $dn;
  global $action;
  $value = trim($value);
  if( $value == '' ) return ''; // OK

  $excludedn = false;
  if( $action == 'save' ) $excludedn = trim($dn);

  if( $ldap->countMail( $_SESSION['base_dn'], $value, $excludedn ) > 0 ) {	
	return _('User, vCard or distribution list with this email address already exists');
  } else {
	return '';
  }
}

function checkuniquealias( $form, $key, $value ) {
  global $ldap;
  global $action;
  global $dn;
  $excludedn = false;
  if( $action == 'save' ) $excludedn = trim($dn);
  $lst = array_unique( array_filter( array_map( 'trim', preg_split( '/\n/', $value ) ), 'strlen') );
  $str = '';
  foreach( $lst as $alias ) {
	debug( "looking at $alias, exluding $dn" );
	if( $ldap->countMail( $_SESSION['base_dn'], $alias, $excludedn ) > 0 ) {
	  $str .= _('Email address ').MySmarty::htmlentities($alias)._(' collision <br />');
	}
  }
  return $str;
}

/**** Submenu for current page ***/
$menuitems[$sidx]['selected'] = 'selected';
$heading = '';

/**** Form/data handling ***/
if (!empty($_REQUEST['action']) && 
    in_array($_REQUEST['action'],$valid_actions)) $action = trim($_REQUEST['action']);
else array_push($errors, _("Error: need valid action to proceed") );

if (!$errors && $auth->group() != 'maintainer' && $auth->group() != 'admin') 
	 array_push($errors, _("Error: You don't have the required Permissions") );

$attributes = array( 'title', 'cn', 'sn', 'mail', 'alias', 'o',
                     'ou', 'roomNumber', 'street', 'postOfficeBox',
                     'postalCode', 'l', 'c', 'telephoneNumber',
                     'facsimileTelephoneNumber' );

$entries = array( 'firstname' => array( 'name' => _('First Name'),
										'validation' => 'notempty',
										'comment' => _('Required') ),
				  'lastname' => array( 'name' => _('Last Name'),
									   'validation' => 'notempty',
									   'comment' => _('Required') ),
				  'title' => array( 'name' => _('Title') ),
				  'mail'  => array( 'name' => _('Primary E-Mail Address'),
									'validation' => 'checkuniquemail' ),
				  'alias' => array( 'name' => _('E-Mail Aliases'),
									'type' => 'textarea',
									'validation' => 'checkuniquealias',
									'comment' => _('One address per line')),
				  'o' => array( 'name' => _('Organisation') ),
				  'ou' => array( 'name' => _('Organisational Unit') ),
				  'roomNumber' => array( 'name' => _('Room Number') ),
				  'street' => array( 'name' => _('Street Address') ),
				  'postOfficeBox' => array( 'name' => _('Post Box') ),
				  'postalCode' => array( 'name' => _('Postal Code') ),
				  'l' => array( 'name' => _('City') ),
				  'c' => array( 'name' => _('Country') ),
				  'telephoneNumber' => array( 'name' => _('Telephone Number') ),
				  'facsimileTelephoneNumber' => array( 'name' => _('Fax Number') ));
$entries['action'] = array( 'name' => 'action',
							'type' => 'hidden' );

$dn = '';
if( $action == 'modify' || $action == 'delete' || $action == 'save' || $action == 'kill' ) {
  if( $_REQUEST['dn'] ) {
	$dn = $_REQUEST['dn'];
  } else {  
	array_push($errors, sprintf(_("Error: DN required for %s operation"), $action ));
  }
}

$form =& new KolabForm( 'vcard', 'createaddr.tpl', $entries );

if( !$errors ) {
  switch( $action ) {
  case 'create':
	$form->entries['action']['value'] = 'firstsave';
	$heading = _('Add External Address'); 
	$content = $form->outputForm();
	break;
  case 'firstsave':
  case 'save':	
	if( $form->isSubmitted() ) {
	  if( !$form->validate() ) {
		$form->setValues();
		$content = $form->outputForm();
	  } else {
		$addressbook_root = "cn=external,".$_SESSION['base_dn'];   
		$ldap_object = array('objectClass' => array( 'top', 'inetOrgPerson', 'kolabInetOrgPerson' ) );
		$firstname = trim($_POST['firstname']);
		$lastname = trim($_POST['lastname']);
		$ldap_object['sn'] = trim($lastname);
		$ldap_object['cn'] = trim( $firstname.' '.$ldap_object['sn']);
		$ldap_object['givenName'] = trim($firstname);
		foreach ($attributes as $attr) {
		  if ($attr == 'sn' || $attr == 'cn' || $attr == 'alias' ) continue;
		  $count = 0;
		  $key = $attr;
		  $args = array();
		  while (!empty($_POST[$key])) {
			$args[$count] = $_POST[$key];
			$count++;
			$key = $attr."_".$count;
		  }
		  if ($count > 0) $ldap_object[$attr] = $args;
		  elseif (!empty($_POST[$key])) $ldap_object[$attr] = $_POST[$key];  
		  else $ldap_object[$attr] = array();
		}
		$ldap_object['alias'] = array_unique( array_filter( array_map( 'trim', preg_split( '/\n/', $_POST['alias'] ) ), 'strlen') );

		if ($action == "save") {
		  if (!$errors) {
			if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap_object['cn'].",".$addressbook_root;
			else $newdn = $dn;
			debug("action=save, dn=$dn, newdn=$newdn<br/>\n");
			if (strcmp($dn,$newdn) != 0) {
			  if (($result=ldap_read($ldap->connection,$dn,"(objectclass=*)")) &&
				  ($entry=ldap_first_entry($ldap->connection,$result)) &&
				  ($oldattrs=ldap_get_attributes($ldap->connection,$entry))) {
				foreach( $ldap_object as $k => $v ) if( $v == array() ) unset( $ldap_object[$k] );
				if (!ldap_add($ldap->connection,$newdn, $ldap_object) || !ldap_delete($ldap->connection,$dn)) {
				  array_push($errors, sprintf(_("LDAP Error: could not rename %s to %s: %s"), $dn,
											  $newdn, ldap_error($ldap->connection)));
				} else {
				  $messages[] = sprintf( _("%s successfully updated"), $newdn);
				}
				$dn = $newdn;
			  } else {
				array_push($errors,sprintf(_("LDAP Error: could not read %s: %s"), $dn,
										   ldap_error($ldap->connection)));
			  }
			} else {
			  if (!ldap_modify($ldap->connection, $dn, $ldap_object)) {
				array_push($errors, sprintf(_("LDAP Error: could not modify object %s: %s"),$dn,
											ldap_error($ldap->connection)));
			  } else {
				$messages[] = sprintf(_("%s successfully updated"), $dn);
			  }
			}
		  } 
		} else {
		  if (!$errors) {
			$dn = "cn=".$ldap_object['cn'].",".$addressbook_root;
			foreach( $ldap_object as $k => $v ) if( $v == array() ) unset( $ldap_object[$k] );
			if ($dn && !ldap_add($ldap->connection, $dn, $ldap_object)) {
			  array_push($errors, sprintf(_("LDAP Error: could not add object %s: %s"), $dn,
										  ldap_error($ldap->connection)));
			} else {
			  $messages[] = sprintf(_("%s successfully added"), $dn);
			}
		  }
		  if ($errors) {
			//print("<div class=\"maintitle\"> Create New Address Book Entry </div>\n");
			$form->entries['action']['value'] = 'create';
			break;
		  }
		}
		$form->entries['action']['value'] = 'modify';
		$heading = _('Modify External Address');
		$form->setValues();
		$form->entries['dn'] = array( 'name' => 'dn',
									  'type' => 'hidden',
									  'value' => $dn );
		$content = $form->outputForm();		
		
	  }
	}
	break;
  case 'modify':
	$result = $ldap->search( $dn, '(objectClass=inetOrgPerson)' );
	if( $result ) {
	  $ldap_object = ldap_get_entries( $ldap->connection, $result );
	  if( $ldap_object['count'] == 1 ) {
		fill_form_for_modify( $form, $ldap_object[0] );
		$form->entries['action']['value'] = 'save';
		$form->entries['dn'] = array( 'name' => 'dn',
									  'type' => 'hidden',
									  'value' => $dn );
		$heading = _('Modify External Address'); 
		$content = $form->outputForm();
	  } else {
		array_push($errors, sprintf(_("Error: Multiple results returned for DN %s"), $dn) );
	  }
	}
	break;
  case 'delete':
	foreach( $form->entries as $k => $v ) {
	  if( $v['type'] != 'hidden' ) {
		$form->entries[$k]['attrs'] = 'readonly';
	  }
	}
	$result = $ldap->search( $dn, '(objectClass=*)' );
	if( $result ) {
	  $ldap_object = ldap_get_entries( $ldap->connection, $result );
	  if( $ldap_object['count'] == 1 ) {
		fill_form_for_modify( $form, $ldap_object[0] );
		$form->entries['action']['value'] = 'kill';
		foreach( array_keys($form->entries) as $key ) {
		  $form->entries[$key]['attrs'] = 'readonly';
		}
		$form->submittext = _('Delete');
		$heading = _('Delete External Address');
		$content = $form->outputForm();
	  } else {
		array_push($errors, sprintf(_("Error: Multiple results returned for DN %s"), $dn) );
	  }
	}
	break;
  case 'kill':
	if (!$errors) {    
	  if (!($ldap->deleteObject($dn))) {
		array_push($errors, sprintf(_("LDAP Error: could not delete %s: %s"),$dn,
									ldap_error($ldap->connection)));
	  } else {
		$heading = _('Entry Deleted');
		$messages[] = sprintf( _("Address book entry with DN %s was deleted"), $dn);
		$contenttemplate = 'addrdeleted.tpl';
	  }
	}
	break;
  }
}

/**** Insert into template and output ***/
$smarty =& new MySmarty();
$smarty->assign( 'errors', array_merge($errors,$form->errors) );
$smarty->assign( 'messages', $messages );
$smarty->assign( 'heading', $heading );
$smarty->assign( 'uid', $auth->uid() );
$smarty->assign( 'group', $auth->group() );
$smarty->assign( 'page_title', $menuitems[$sidx]['title'] );
$smarty->assign( 'menuitems', $menuitems );
$smarty->assign( 'submenuitems', 
				 array_key_exists('submenu', 
								  $menuitems[$sidx])?$menuitems[$sidx]['submenu']:array() );
$smarty->assign( 'heading', $heading );
$smarty->assign( 'form', $content );
if( isset( $dn ) ) $smarty->assign( 'dn', $dn );
if( count($messages)>0) $smarty->assign( 'messages', $messages );
$smarty->assign( 'maincontent', $contenttemplate );
$smarty->display('page.tpl');

/*
  Local variables:
  mode: php
  indent-tabs-mode: t
  tab-width: 4
  buffer-file-coding-system: utf-8
  End:
 */
?>

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

--- addr.php DELETED ---

--- index.php DELETED ---



From cvs at intevation.de  Sun Feb  5 21:13:57 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  5 Feb 2006 21:13:57 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/www/admin/administrator
	admin.php.in, NONE, 1.1 index.php.in, NONE, 1.1 admin.php, 1.12,
	NONE index.php, 1.7, NONE 
Message-ID: <20060205201357.3AB641006B5@lists.intevation.de>

Author: richard

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

Added Files:
	admin.php.in index.php.in 
Removed Files:
	admin.php index.php 
Log Message:
Use the new kolab_php_module_prefix variable



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

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

--- admin.php DELETED ---

--- index.php DELETED ---



From cvs at intevation.de  Sun Feb  5 21:13:57 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  5 Feb 2006 21:13:57 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist
	index.php.in, NONE, 1.1 list.php.in, NONE, 1.1 index.php, 1.14,
	NONE list.php, 1.23, NONE 
Message-ID: <20060205201357.422141006B6@lists.intevation.de>

Author: richard

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

Added Files:
	index.php.in list.php.in 
Removed Files:
	index.php list.php 
Log Message:
Use the new kolab_php_module_prefix variable



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

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

--- index.php DELETED ---

--- list.php DELETED ---



From cvs at intevation.de  Sun Feb  5 21:13:57 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  5 Feb 2006 21:13:57 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer
	domainmaintainer.php.in, NONE, 1.1 index.php.in, NONE,
	1.1 domainmaintainer.php, 1.3, NONE index.php, 1.1, NONE 
Message-ID: <20060205201357.495761006B9@lists.intevation.de>

Author: richard

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

Added Files:
	domainmaintainer.php.in index.php.in 
Removed Files:
	domainmaintainer.php index.php 
Log Message:
Use the new kolab_php_module_prefix variable



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

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

--- domainmaintainer.php DELETED ---

--- index.php DELETED ---



From cvs at intevation.de  Sun Feb  5 21:13:57 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  5 Feb 2006 21:13:57 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/www/admin/kolab
	codefusion.php.in, NONE, 1.1 erfrakon.php.in, NONE,
	1.1 index.php.in, NONE, 1.1 intevation.php.in, NONE,
	1.1 kdab.php.in, NONE, 1.1 kde.php.in, NONE, 1.1 versions.php.in,
	1.2, 1.3 codefusion.php, 1.2, NONE erfrakon.php, 1.3,
	NONE index.php, 1.3, NONE intevation.php, 1.2, NONE kdab.php,
	1.2, NONE kde.php, 1.3, NONE 
Message-ID: <20060205201357.5ED191006BA@lists.intevation.de>

Author: richard

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

Modified Files:
	versions.php.in 
Added Files:
	codefusion.php.in erfrakon.php.in index.php.in 
	intevation.php.in kdab.php.in kde.php.in 
Removed Files:
	codefusion.php erfrakon.php index.php intevation.php kdab.php 
	kde.php 
Log Message:
Use the new kolab_php_module_prefix variable



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

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

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

--- NEW FILE: intevation.php.in ---
<?php
/*
 (c) 2004 Klarlvdalens Datakonsult AB
 (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
 (c) 2003 Martin Konold <martin.konold at erfrakon.de>
 This program is Free Software under the GNU General Public License (>=v2).
 Read the file COPYING that comes with this packages for details.
*/

require_once('@kolab_php_module_prefix at admin/include/mysmarty.php');
require_once('@kolab_php_module_prefix at admin/include/headers.php');
require_once('@kolab_php_module_prefix at admin/include/locale.php');
require_once('@kolab_php_module_prefix at admin/include/authenticate.php');

/**** Authentication etc. ***/
$sidx = 'about';

require_once('@kolab_php_module_prefix at admin/include/menu.php');


/**** Submenu for current page ***/
$menuitems[$sidx]['selected'] = 'selected';

/**** Insert into template and output ***/
$smarty = new MySmarty();
$smarty->assign( 'topdir', $topdir );
$smarty->assign( 'uid', $auth->uid() );
$smarty->assign( 'group', $auth->group() );
$smarty->assign( 'page_title', $menuitems[$sidx]['title'] );
$smarty->assign( 'menuitems', $menuitems );
$smarty->assign( 'submenuitems', $menuitems[$sidx]['submenu'] );
$smarty->assign( 'maincontent', 'intevation.tpl' );
$smarty->display('page.tpl');

/*
  Local variables:
  mode: php
  indent-tabs-mode: t
  tab-width: 4
  buffer-file-coding-system: utf-8
  End:
*/
 ?>

--- NEW FILE: kdab.php.in ---
<?php
/*
 (c) 2004 Klarlvdalens Datakonsult AB
 (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
 (c) 2003 Martin Konold <martin.konold at erfrakon.de>
 This program is Free Software under the GNU General Public License (>=v2).
 Read the file COPYING that comes with this packages for details.
*/

require_once('@kolab_php_module_prefix at admin/include/mysmarty.php');
require_once('@kolab_php_module_prefix at admin/include/headers.php');
require_once('@kolab_php_module_prefix at admin/include/locale.php');
require_once('@kolab_php_module_prefix at admin/include/authenticate.php');

/**** Authentication etc. ***/
$sidx = 'about';

require_once('@kolab_php_module_prefix at admin/include/menu.php');


/**** Submenu for current page ***/
$menuitems[$sidx]['selected'] = 'selected';

/**** Insert into template and output ***/
$smarty =& new MySmarty();
$smarty->assign( 'topdir', $topdir );
$smarty->assign( 'uid', $auth->uid() );
$smarty->assign( 'group', $auth->group() );
$smarty->assign( 'page_title', $menuitems[$sidx]['title'] );
$smarty->assign( 'menuitems', $menuitems );
$smarty->assign( 'submenuitems', $menuitems[$sidx]['submenu'] );
$smarty->assign( 'maincontent', 'kdab.tpl' );
$smarty->display('page.tpl');

/*
  Local variables:
  mode: php
  indent-tabs-mode: t
  tab-width: 4
  buffer-file-coding-system: utf-8
  End:
*/
 ?>

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

Index: versions.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/kolab/versions.php.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- versions.php.in	17 Jan 2006 19:20:20 -0000	1.2
+++ versions.php.in	5 Feb 2006 20:13:55 -0000	1.3
@@ -7,15 +7,15 @@
  Read the file COPYING that comes with this packages for details.
 */
 
-require_once('admin/include/mysmarty.php');
-require_once('admin/include/headers.php');
-require_once('admin/include/locale.php');
-require_once('admin/include/authenticate.php');
+require_once('@kolab_php_module_prefix at admin/include/mysmarty.php');
+require_once('@kolab_php_module_prefix at admin/include/headers.php');
+require_once('@kolab_php_module_prefix at admin/include/locale.php');
+require_once('@kolab_php_module_prefix at admin/include/authenticate.php');
 
 /**** Authentication etc. ***/
 $sidx = 'about';
 
-require_once('admin/include/menu.php');
+require_once('@kolab_php_module_prefix at admin/include/menu.php');
 
 /**** Submenu for current page ***/
 $menuitems[$sidx]['selected'] = 'selected';

--- codefusion.php DELETED ---

--- erfrakon.php DELETED ---

--- index.php DELETED ---

--- intevation.php DELETED ---

--- kdab.php DELETED ---

--- kde.php DELETED ---



From cvs at intevation.de  Sun Feb  5 21:13:57 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  5 Feb 2006 21:13:57 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/www/admin/maintainer
	index.php.in, NONE, 1.1 maintainer.php.in, NONE, 1.1 index.php,
	1.8, NONE maintainer.php, 1.14, NONE 
Message-ID: <20060205201357.644D71006BC@lists.intevation.de>

Author: richard

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

Added Files:
	index.php.in maintainer.php.in 
Removed Files:
	index.php maintainer.php 
Log Message:
Use the new kolab_php_module_prefix variable



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

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

--- index.php DELETED ---

--- maintainer.php DELETED ---



From cvs at intevation.de  Sun Feb  5 21:13:57 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  5 Feb 2006 21:13:57 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/www/admin/service
	index.php.in, NONE, 1.1 index.php, 1.26, NONE 
Message-ID: <20060205201357.6E3A31005C5@lists.intevation.de>

Author: richard

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

Added Files:
	index.php.in 
Removed Files:
	index.php 
Log Message:
Use the new kolab_php_module_prefix variable



--- NEW FILE: index.php.in ---
<?php
require_once('@kolab_php_module_prefix at admin/include/mysmarty.php');
require_once('@kolab_php_module_prefix at admin/include/headers.php');
require_once('@kolab_php_module_prefix at admin/include/locale.php');
require_once('@kolab_php_module_prefix at admin/include/authenticate.php');

$errors = array();

/**** Authentication etc. ***/
$sidx = 'service';

if( $auth->group() != 'admin') {
   array_push($errors, _("Error: You don't have Permissions to access this Menu"));
}

require_once('@kolab_php_module_prefix at admin/include/menu.php');

/**** Submenu for current page ***/
$menuitems[$sidx]['selected'] = 'selected';

/**** Extract data from LDAP, fill forms, write back to LDAP ***/


function postvalue( $varname )
{
  if( isset($_REQUEST[$varname]) && $_REQUEST[$varname] == true ) return 'TRUE';
  else return 'FALSE';
}

function extract_ldap_values()
{
  global $ldap;
  global $pop3;
  global $pop3s;
  global $imap;
  global $imaps;
  global $sieve;
  global $ftp;
  global $http;
  global $httpallowunauthfb;
  global $amavis;
  global $quotawarn;
  global $freebusypast;
  global $postfixmydomain;
  global $postfixmydestination;
  global $postfixmynetworks;
  global $postfixallowunauth;
  global $postfixrelayhost;
  global $postfixrelayport;
  global $kolabhost;
  global $kolabfilterverifyfrom;
  global $kolabfilterallowsender;
  global $kolabfilterrejectforgedfrom;

  // Get values from LDAP
  if (($result = ldap_read($ldap->connection, "k=kolab,".$_SESSION['base_dn'], '(objectclass=*)')) &&
	  ($entry = ldap_first_entry($ldap->connection, $result)) &&
	  ($attrs = ldap_get_attributes($ldap->connection, $entry))) {
	$pop3 = $attrs['cyrus-pop3'][0];
	$pop3s = $attrs['cyrus-pop3s'][0];
	$imap = $attrs['cyrus-imap'][0];
	$imaps = $attrs['cyrus-imaps'][0];
	$sieve = $attrs['cyrus-sieve'][0];
	$ftp = $attrs['proftpd-ftp'][0];
	$http = $attrs['apache-http'][0];
	$httpallowunauthfb = $attrs['apache-allow-unauthenticated-fb'][0];
	$amavis = $attrs['postfix-enable-virus-scan'][0];
	$quotawarn = $attrs['cyrus-quotawarn'][0];
	$freebusypast = $attrs['kolabFreeBusyPast'][0];
	$postfixmydomain = $attrs['postfix-mydomain'][0];
	$postfixmydestination = $attrs['postfix-mydestination'];
	unset($postfixmydestination['count']);
	unset( $attrs['postfix-mynetworks']['count'] );
	$postfixmynetworks = join(', ',$attrs['postfix-mynetworks']);
	$postfixallowunauth = $attrs['postfix-allow-unauthenticated'][0];
	$postfixrelayhost = $attrs['postfix-relayhost'][0];
	$postfixrelayport = $attrs['postfix-relayport'][0];
	$kolabhost = $attrs['kolabHost'];
	unset( $kolabhost['count'] );
	$kolabfilterverifyfrom = $attrs['kolabfilter-verify-from-header'][0];
	$kolabfilterallowsender = $attrs['kolabfilter-allow-sender-header'][0];
	$kolabfilterrejectforgedfrom = $attrs['kolabfilter-reject-forged-from-header'][0];
	ldap_free_result($result);
  }
}

function toboolstr( $b ) { return ( $b == 'TRUE' )?'true':'false'; }


extract_ldap_values();

// Write back to LDAP
if( $_REQUEST['submitsystemalias'] ) {
  $mail = trim($_REQUEST['systemaliasmail']);
  $dn = $ldap->dnForMailOrAlias( $mail );
  if( !$dn ) {
	$errors[] = sprintf(_("No account found for email address %s"), $mail);
  } else {
	foreach( array( 'postmaster', 'hostmaster', 'abuse', 'virusalert', 'MAILER-DAEMON' ) as $group ) {
	  $attrs = array( 'objectClass' => array( 'top', 'kolabGroupOfNames' ),
					  'cn' => $group,
					  'mail' => $group.'@'.$postfixmydomain,
					  'member' => $dn );
	  if( !ldap_add( $ldap->connection, "cn=$group,".$_SESSION['base_dn'], $attrs ) ) {
		$errors[] = sprintf(_("LDAP Error: Failed to add distribution list %s: %s"), $group, $ldap->error());
	  } else {
		$messages[] = sprintf( _("Successfully created distribution list %s"), $group);
	  }
	}
  }
}

if( $_REQUEST['submitservices'] ) {
  $attrs = array();
  if( postvalue( 'pop3' ) != $pop3 )   $attrs['cyrus-pop3'] = postvalue( 'pop3' );
  if( postvalue( 'pop3s' ) != $pop3s ) $attrs['cyrus-pop3s'] = postvalue( 'pop3s' );
  if( postvalue( 'imap' ) != $imap )   $attrs['cyrus-imap'] = postvalue( 'imap' );
  if( postvalue( 'imaps' ) != $imaps ) $attrs['cyrus-imaps'] = postvalue( 'imaps' );
  if( postvalue( 'sieve' ) != $sieve ) $attrs['cyrus-sieve'] = postvalue( 'sieve' );
  if( postvalue( 'ftp' ) != $ftp )     $attrs['proftpd-ftp'] = postvalue( 'ftp' );
  if( postvalue( 'http' ) != $http )    $attrs['apache-http'] = postvalue( 'http' );
  if( postvalue( 'amavis' ) != $amavis )  $attrs['postfix-enable-virus-scan'] = postvalue( 'amavis' );
  
  if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) {
	$errors[] = sprintf( _("LDAP Error: failed to modify kolab configuration object: %s"),
						 ldap_error($ldap->connection));
  }
}

if( $_REQUEST['submitquotawarn'] ) {
  $attrs = array();
  $attrs['cyrus-quotawarn'] = trim( $_REQUEST['quotawarn'] );
  if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) {
	$errors[] = sprintf(_("LDAP Error: failed to modify kolab configuration object: %s"),
						ldap_error($ldap->connection));
  }
}

if( $_REQUEST['submithttpallowunauthfb'] ) {
  $attrs = array();
  $attrs['apache-allow-unauthenticated-fb'] = postvalue( 'httpallowunauthfb' );
  if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) {
	$errors[] = sprintf(_("LDAP Error: failed to modify kolab configuration object: %s"),
						ldap_error($ldap->connection));
  }
}

if( $_REQUEST['submitfreebusypast'] ) {
  $attrs = array();
  $attrs['kolabFreeBusyPast'] = trim( $_REQUEST['freebusypast'] );
  if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) {
	$errors[] = sprintf(_("LDAP Error: failed to modify kolab configuration object: %s"),
						ldap_error($ldap->connection));
  }
}

if( $_REQUEST['submitpostfixmynetworks'] ) {
  $attrs = array();
  $attrs['postfix-mynetworks'] = preg_split( "/[\s,]+/", trim( $_REQUEST['postfixmynetworks'] ) );
  //if( $attrs['postfix-mynetworks'] == '' ) $attrs['postfix-mynetworks'] = array();
  if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) {
	$errors[] = sprintf(_("LDAP Error: failed to modify kolab configuration object: %s"),
						ldap_error($ldap->connection));
  }
}

if( $_REQUEST['submitpostfixallowunauth'] ) {
  $attrs = array();
  $attrs['postfix-allow-unauthenticated'] = postvalue( 'postfixallowunauth' );
  if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) {
	$errors[] = sprintf(_("LDAP Error: failed to modify kolab configuration object: %s"),
						ldap_error($ldap->connection));
  }
}

if( $_REQUEST['submitkolabfilter'] ) {
  $attrs = array(
				 'kolabfilter-verify-from-header'        => postvalue( 'kolabfilterverifyfrom' ),
				 'kolabfilter-allow-sender-header'       => postvalue( 'kolabfilterallowsender' ),
				 'kolabfilter-reject-forged-from-header' => $_REQUEST['kolabfilterrejectforgedfrom']=='TRUE'?'TRUE':'FALSE' );
  if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) {
	$errors[] = sprintf(_("LDAP Error: failed to modify kolab configuration object: %s"),
						ldap_error($ldap->connection));
  }
 }

if( $_REQUEST['submitpostfixrelayhost'] ) {
  $host_val = trim( $_REQUEST['postfixrelayhost'] );
  $port_val = trim( $_REQUEST['postfixrelayport'] );
  if( $host_val == '' ) $host_val = array();
  if( $port_val == '' ) $port_val = array();
  $attrs = array();  
  $attrs['postfix-relayhost'] = $host_val;
  $attrs['postfix-relayport'] = $port_val;
  if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) {
	$errors[] = sprintf(_("LDAP Error: failed to modify kolab configuration object: %s"),
						ldap_error($ldap->connection));
  }
}

// Delete domain
if( $_REQUEST['deletedestination'] ) {
  extract_ldap_values();
  debug_var_dump($_REQUEST['adestination']);
  $key = array_search( trim($_REQUEST['adestination']),$postfixmydestination);
  if( $key !== false ) {
	unset( $postfixmydestination[ $key ] );
  }
  $postfixmydestination = array_values( $postfixmydestination );
  debug_var_dump($postfixmydestination);
  $attrs = array();
  $attrs['postfix-mydestination'] = $postfixmydestination;
  if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) {
	$errors[] = sprintf(_("LDAP Error: failed to modify kolab configuration object: %s"),
						ldap_error($ldap->connection));
  }
  $domain_obj_dn = 'cn='.$ldap->escape(trim($_REQUEST['adestination'])).',cn=domains,cn=internal,'.$_SESSION['base_dn'];
  debug("Trying to delete $domain_obj_dn");
  if( !$errors && $ldap->read($domain_obj_dn) && !ldap_delete($ldap->connection, $domain_obj_dn ) ) {
	$errors[] = sprintf(_("LDAP Error: Failed to delete domain object %s: %s"), $domain_obj_dn,
						ldap_error($ldap->connection));
  }
}
// Add domain
if( $_REQUEST['adddestination'] ) {
  extract_ldap_values();
  if( trim($_REQUEST['adestination']) ) {
	$postfixmydestination[] = trim($_REQUEST['adestination']);
	$attrs = array();
	$attrs['postfix-mydestination'] = $postfixmydestination;
	if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) {
	  $errors[] = sprintf(_("LDAP Error: failed to modify kolab configuration object: %s"),
						  ldap_error($ldap->connection));
	}
  }
}

// Delete kolabhost
if( $_REQUEST['deletekolabhost'] ) {
  extract_ldap_values();
  $key = array_search( trim($_REQUEST['akolabhost']),$kolabhost);
  if( $key !== false ) {
	unset( $kolabhost[ $key ] );
  }
  $kolabhost = array_values( $kolabhost );
  $attrs = array();
  $attrs['kolabhost'] = $kolabhost;
  if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) {
	$errors[] = sprintf(_("LDAP Error: failed to modify kolab configuration object: %s"),
						ldap_error($ldap->connection));
  }
}

// Add kolabhost
if( $_REQUEST['addkolabhost'] ) {
  extract_ldap_values();
  if( trim($_REQUEST['akolabhost']) ) {
	$kolabhost[] = trim($_REQUEST['akolabhost']);
	$attrs = array();
	$attrs['kolabhost'] = $kolabhost;
	if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) {
	  $errors[] = sprintf(_("LDAP Error: failed to modify kolab configuration object: %s"),
						  ldap_error($ldap->connection));
	}
  }
}

// Fill in output form
extract_ldap_values();
$entries = array( array( 'service' => 'pop3', 'name'  => _('POP3 Service'), 'enabled' => toboolstr( $pop3 ) ),
				  array( 'service' => 'pop3s', 'name' => _('POP3/SSL service (TCP port 995)'), 'enabled' => toboolstr( $pop3s ) ),
				  array( 'service' => 'imap', 'name'  => _('IMAP Service'), 'enabled' => toboolstr( $imap ) ),
				  array( 'service' => 'imaps', 'name' => _('IMAP/SSL Service (TCP port 993)'), 'enabled' => toboolstr( $imaps ) ),
				  array( 'service' => 'sieve', 'name' => _('Sieve service (TCP port 2000)'), 'enabled' => toboolstr( $sieve ) ),
				  array( 'service' => 'ftp', 
						 'name'   => _('FTP FreeBusy Service (Legacy, not interoperable with Kolab2 FreeBusy)'), 
						 'enabled' => toboolstr( $ftp ) ),
				  array( 'service' => 'http', 'name'  => _('HTTP FreeBusy Service (Legacy)'), 'enabled' => toboolstr( $http ) ),
				  array( 'service' => 'amavis', 'name' => _('Amavis Email Scanning (Virus/Spam)'), 
						 'enabled' => toboolstr( $amavis ) ) );

/**** Check for system aliases ****/
function exists_group( $group ) {
  global $ldap;
  $filter = '(&(objectClass=kolabGroupOfNames)(cn='.$ldap->escape($group).'))';
  $res = $ldap->search( $_SESSION['base_dn'], $filter, array( 'dn' ) );
  return ( $ldap->count($res) > 0 );
}

/**** Insert into template and output ***/
$smarty = new MySmarty();
$smarty->assign( 'errors', $errors );
$smarty->assign( 'uid', $auth->uid() );
$smarty->assign( 'group', $auth->group() );
$smarty->assign( 'page_title', $menuitems[$sidx]['title'] );
$smarty->assign( 'entries', $entries );
$smarty->assign( 'quotawarn', $quotawarn );
$smarty->assign( 'httpallowunauthfb', toboolstr($httpallowunauthfb) );
$smarty->assign( 'freebusypast', $freebusypast );
$smarty->assign( 'postfixmydestination', $postfixmydestination );
$smarty->assign( 'postfixmynetworks', $postfixmynetworks );
$smarty->assign( 'postfixallowunauth', toboolstr($postfixallowunauth) );
$smarty->assign( 'postfixrelayhost', $postfixrelayhost );
$smarty->assign( 'postfixrelayport', $postfixrelayport );
$smarty->assign( 'kolabfilterverifyfrom', toboolstr($kolabfilterverifyfrom) );
$smarty->assign( 'kolabfilterallowsender', toboolstr($kolabfilterallowsender) );
$smarty->assign( 'kolabfilterrejectforgedfrom', toboolstr($kolabfilterrejectforgedfrom) );
$smarty->assign( 'kolabhost', $kolabhost );
$smarty->assign( 'menuitems', $menuitems );
$smarty->assign( 'submenuitems', 
				 array_key_exists('submenu', 
								  $menuitems[$sidx])?$menuitems[$sidx]['submenu']:array() );
$smarty->assign( 'maincontent', 'service.tpl' );

$smarty->assign( 'systemaliasconf', false );
if( $auth->group() == 'admin' ) {
  if( !exists_group( 'hostmaster' ) ||
	  !exists_group( 'postmaster' ) ||
	  !exists_group( 'abuse' ) ||
	  !exists_group( 'virusalert' ) ||
	  !exists_group( 'MAILER-DAEMON' ) ) {
	// Ok, user did not set up system aliases
	$smarty->assign( 'systemaliasconf', true );
  }
}

$smarty->display('page.tpl');

/*
  Local variables:
  mode: php
  indent-tabs-mode: t
  tab-width: 4
  buffer-file-coding-system: utf-8
  End:
 */
?>

--- index.php DELETED ---



From cvs at intevation.de  Sun Feb  5 21:13:57 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  5 Feb 2006 21:13:57 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder
	index.php.in, NONE, 1.1 sf.php.in, NONE, 1.1 index.php, 1.9,
	NONE sf.php, 1.24, NONE 
Message-ID: <20060205201357.7EA791006C1@lists.intevation.de>

Author: richard

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

Added Files:
	index.php.in sf.php.in 
Removed Files:
	index.php sf.php 
Log Message:
Use the new kolab_php_module_prefix variable



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

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

--- index.php DELETED ---

--- sf.php DELETED ---



From cvs at intevation.de  Sun Feb  5 21:13:57 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  5 Feb 2006 21:13:57 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/www/admin/user
	deliver.php.in, NONE, 1.1 forward.php.in, NONE, 1.1 index.php.in,
	NONE, 1.1 vacation.php.in, NONE, 1.1 user.php.in, 1.2,
	1.3 deliver.php, 1.4, NONE forward.php, 1.14, NONE index.php,
	1.15, NONE vacation.php, 1.20, NONE 
Message-ID: <20060205201357.8D5741006C4@lists.intevation.de>

Author: richard

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

Modified Files:
	user.php.in 
Added Files:
	deliver.php.in forward.php.in index.php.in vacation.php.in 
Removed Files:
	deliver.php forward.php index.php vacation.php 
Log Message:
Use the new kolab_php_module_prefix variable



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

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

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

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

Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- user.php.in	11 Jan 2006 15:51:34 -0000	1.2
+++ user.php.in	5 Feb 2006 20:13:55 -0000	1.3
@@ -6,11 +6,11 @@
  Read the file COPYING that comes with this packages for details.
 */
 
-require_once('admin/include/mysmarty.php');
-require_once('admin/include/headers.php');
-require_once('admin/include/locale.php');
-require_once('admin/include/authenticate.php');
-require_once('admin/include/form.class.php');
+require_once('@kolab_php_module_prefix at admin/include/mysmarty.php');
+require_once('@kolab_php_module_prefix at admin/include/headers.php');
+require_once('@kolab_php_module_prefix at admin/include/locale.php');
+require_once('@kolab_php_module_prefix at admin/include/authenticate.php');
+require_once('@kolab_php_module_prefix at admin/include/form.class.php');
 
 /**** Functions ***/
 function comment( $s ) {
@@ -324,7 +324,7 @@
 /**** Authentication etc. ***/
 $sidx = 'user';
 
-require_once('admin/include/menu.php');
+require_once('@kolab_php_module_prefix at admin/include/menu.php');
 $menuitems[$sidx]['selected'] = 'selected';
 
 /**** Logic ***/

--- deliver.php DELETED ---

--- forward.php DELETED ---

--- index.php DELETED ---

--- vacation.php DELETED ---



From cvs at intevation.de  Sun Feb  5 21:15:12 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  5 Feb 2006 21:15:12 +0100 (CET)
Subject: richard: server/kolab-resource-handlers/kolab-resource-handlers
	Makefile.am, 1.5, 1.6 
Message-ID: <20060205201512.872D41006B0@lists.intevation.de>

Author: richard

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

Modified Files:
	Makefile.am 
Log Message:
Use the new kolab_php_module_prefix variable

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am	3 Jan 2006 22:06:57 -0000	1.5
+++ Makefile.am	5 Feb 2006 20:15:10 -0000	1.6
@@ -16,14 +16,15 @@
 
 
 freebusy_FILES = freebusy/misc.php \
-	freebusy/freebusycache.class.php \
-	freebusy/freebusy.class.php \
 	freebusy/freebusycollector.class.php \
 	freebusy/freebusyldap.class.php \
 	freebusy/recurrence.class.php
 
-freebusydir = $(phplibdir2)/freebusy
-dist_freebusy_DATA = $(freebusy_FILES)
+freebusydir = $(phplibdir2)/$(kolab_php_module_prefix)freebusy
+freebusy_DATA = $(freebusy_FILES) \
+	freebusy/freebusycache.class.php \
+	freebusy/freebusy.class.php 
+EXTRA_DIST += $(freebusy_FILES)
 
 
 conffile_FILES = $(srcdir)/freebusy/freebusy.conf \
@@ -37,12 +38,13 @@
 
 
 resmgr_FILES = resmgr/kolabmailtransport.php \
-	resmgr/misc.php \
+	resmgr/misc.php
+
+resmgrdir = $(phplibdir2)/$(kolab_php_module_prefix)kolabfilter
+resmgr_DATA = $(resmgr_FILES) \
 	resmgr/resmgr.php \
 	resmgr/olhacks.php
-
-resmgrdir = $(phplibdir2)/kolabfilter
-dist_resmgr_DATA = $(resmgr_FILES)
+EXTRA_DIST += $(resmgr_FILES)
 
 krhdocdir = $(pkgdocdir)/@PACKAGE@
 dist_krhdoc_DATA = ChangeLog \
@@ -56,6 +58,18 @@
 CLEANFILES += freebusy/freebusy.php
 EXTRA_DIST += freebusy/freebusy.php.in
 
+freebusy/freebusycache.class.php:
+	@$(mkinstalldirs) freebusy
+	$(do_subst) <$(srcdir)/freebusy/freebusycache.class.php.in >$@
+CLEANFILES += freebusy/freebusycache.class.php
+EXTRA_DIST += freebusy/freebusycache.class.php.in
+
+freebusy/freebusy.class.php:
+	@$(mkinstalldirs) freebusy
+	$(do_subst) <$(srcdir)/freebusy/freebusy.class.php.in >$@
+CLEANFILES += freebusy/freebusy.class.php
+EXTRA_DIST += freebusy/freebusy.class.php.in
+
 freebusy/pfb.php:
 	@$(mkinstalldirs) freebusy
 	$(do_subst) <$(srcdir)/freebusy/pfb.php.in >$@
@@ -82,6 +96,19 @@
 CLEANFILES += resmgr/resmgr.conf
 EXTRA_DIST += resmgr/resmgr.conf.in
 
+resmgr/resmgr.php:
+	@$(mkinstalldirs) resmgr
+	$(do_subst) <$(srcdir)/resmgr/resmgr.php.in >$@
+	chmod a+x resmgr/resmgr.php
+CLEANFILES += resmgr/resmgr.php
+EXTRA_DIST += resmgr/resmgr.php.in
+
+resmgr/olhacks.php:
+	@$(mkinstalldirs) resmgr
+	$(do_subst) <$(srcdir)/resmgr/olhacks.php.in >$@
+CLEANFILES += resmgr/olhacks.php
+EXTRA_DIST += resmgr/olhacks.php.in
+
 EXTRA_DIST += dist_conf/common \
 	dist_conf/debian \
 	dist_conf/gentoo \
@@ -94,6 +121,7 @@
 	install -d -m 755 $(DESTDIR)/$(freebusy_cachedir)
 	chmod a+x $(DESTDIR)/$(resmgr_confdir)/kolabfilter.php
 	chmod a+x $(DESTDIR)/$(resmgr_confdir)/kolabmailboxfilter.php
+	chmod a+x $(DESTDIR)/$(phplibdir2)/$(kolab_php_module_prefix)kolabfilter/resmgr.php
 	chmod o=--- $(DESTDIR)/$(resmgr_confdir)/freebusy.conf
 	chmod o=--- $(DESTDIR)/$(resmgr_confdir)/resmgr.conf
 



From cvs at intevation.de  Sun Feb  5 21:15:12 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  5 Feb 2006 21:15:12 +0100 (CET)
Subject: richard: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
	freebusy.class.php.in, 1.1, 1.2 freebusy.php.in, 1.2,
	1.3 freebusycache.class.php.in, 1.1, 1.2 pfb.php.in, 1.2, 1.3 
Message-ID: <20060205201512.A497B1006B3@lists.intevation.de>

Author: richard

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

Modified Files:
	freebusy.class.php.in freebusy.php.in 
	freebusycache.class.php.in pfb.php.in 
Log Message:
Use the new kolab_php_module_prefix variable

Index: freebusy.class.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.class.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- freebusy.class.php.in	5 Feb 2006 20:02:02 -0000	1.1
+++ freebusy.class.php.in	5 Feb 2006 20:15:10 -0000	1.2
@@ -18,7 +18,7 @@
  *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
  */
 
-require_once 'freebusy/recurrence.class.php';
+require_once '@kolab_php_module_prefix at freebusy/recurrence.class.php';
 
 class FreeBusyRecurrence extends Recurrence {
   function FreeBusyRecurrence( &$vfb, &$extra ) {

Index: freebusy.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.php.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- freebusy.php.in	17 Dec 2005 11:05:56 -0000	1.2
+++ freebusy.php.in	5 Feb 2006 20:15:10 -0000	1.3
@@ -18,10 +18,10 @@
  *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
  */
 
-require_once('freebusy/freebusycache.class.php');
-require_once('freebusy/freebusycollector.class.php');
-require_once('freebusy/freebusyldap.class.php');
-require_once('freebusy/misc.php');
+require_once('@kolab_php_module_prefix at freebusy/freebusycache.class.php');
+require_once('@kolab_php_module_prefix at freebusy/freebusycollector.class.php');
+require_once('@kolab_php_module_prefix at freebusy/freebusyldap.class.php');
+require_once('@kolab_php_module_prefix at freebusy/misc.php');
 
 require_once('@resmgr_confdir@/freebusy.conf');
 

Index: freebusycache.class.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusycache.class.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- freebusycache.class.php.in	5 Feb 2006 20:02:02 -0000	1.1
+++ freebusycache.class.php.in	5 Feb 2006 20:15:10 -0000	1.2
@@ -21,7 +21,7 @@
 /*! To load/store partial freebusy lists
     and their ACLs */
     
-require_once('freebusy/misc.php');
+require_once('@kolab_php_module_prefix at freebusy/misc.php');
 require_once('@resmgr_confdir@/freebusy.conf');
 
 class FreeBusyCache {

Index: pfb.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/pfb.php.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pfb.php.in	17 Dec 2005 11:05:56 -0000	1.2
+++ pfb.php.in	5 Feb 2006 20:15:10 -0000	1.3
@@ -30,9 +30,9 @@
 $max_execution_time = ini_get('max_execution_time');
 if( $max_execution_time < 200 ) ini_set('max_execution_time', '200');
 
-require_once('freebusy/freebusyldap.class.php');
-require_once('freebusy/freebusycache.class.php');
-require_once('freebusy/misc.php');
+require_once('@kolab_php_module_prefix at freebusy/freebusyldap.class.php');
+require_once('@kolab_php_module_prefix at freebusy/freebusycache.class.php');
+require_once('@kolab_php_module_prefix at freebusy/misc.php');
 
 require_once('@resmgr_confdir@/freebusy.conf');
 



From cvs at intevation.de  Sun Feb  5 21:15:12 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  5 Feb 2006 21:15:12 +0100 (CET)
Subject: richard: server/kolab-resource-handlers/kolab-resource-handlers/resmgr
	kolabfilter.php.in, 1.5, 1.6 kolabmailboxfilter.php.in, 1.3,
	1.4 olhacks.php.in, 1.1, 1.2 resmgr.php.in, 1.1, 1.2 
Message-ID: <20060205201512.A74EF1006B9@lists.intevation.de>

Author: richard

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

Modified Files:
	kolabfilter.php.in kolabmailboxfilter.php.in olhacks.php.in 
	resmgr.php.in 
Log Message:
Use the new kolab_php_module_prefix variable

Index: kolabfilter.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabfilter.php.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kolabfilter.php.in	11 Jan 2006 15:54:25 -0000	1.5
+++ kolabfilter.php.in	5 Feb 2006 20:15:10 -0000	1.6
@@ -25,8 +25,8 @@
 	 '.:@phplibdir2@:@phppeardir@:'.$include_path);
 
 require_once 'PEAR.php';
-require_once 'kolabfilter/misc.php';
-require_once 'kolabfilter/kolabmailtransport.php';
+require_once '@kolab_php_module_prefix at kolabfilter/misc.php';
+require_once '@kolab_php_module_prefix at kolabfilter/kolabmailtransport.php';
 
 // Profiling code
 /*
@@ -336,7 +336,7 @@
 
 if( !$senderok ) {
   if( $ical && $params['allow_outlook_ical_forward'] ) {
-    require_once('kolabfilter/olhacks.php');
+    require_once('@kolab_php_module_prefix at kolabfilter/olhacks.php');
     $rc = olhacks_embedical( $fqhostname, $sender, $recipients, $from, $subject, $tmpfname );
     if( PEAR::isError( $rc ) ) {
       fwrite(STDOUT,"Filter failed: ".$rc->getMessage()."\n");

Index: kolabmailboxfilter.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabmailboxfilter.php.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolabmailboxfilter.php.in	22 Dec 2005 22:36:15 -0000	1.3
+++ kolabmailboxfilter.php.in	5 Feb 2006 20:15:10 -0000	1.4
@@ -25,8 +25,8 @@
 	 '.:@phplibdir2@:@phppeardir@:'.$include_path);
 
 require_once 'PEAR.php';
-require_once 'kolabfilter/misc.php';
-require_once 'kolabfilter/kolabmailtransport.php';
+require_once '@kolab_php_module_prefix at kolabfilter/misc.php';
+require_once '@kolab_php_module_prefix at kolabfilter/kolabmailtransport.php';
 
 // Load our configuration file
 $params = array();
@@ -97,7 +97,7 @@
 }
 fclose($tmpf);
 if( $ical ) {
-  require_once 'kolabfilter/resmgr.php';
+  require_once '@kolab_php_module_prefix at kolabfilter/resmgr.php';
   $newrecips = array();
   foreach( $recipients as $recip ) {
     myLog("Calling resmgr_filter( $sender, $recip, $tmpfname )", RM_LOG_DEBUG);

Index: olhacks.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/olhacks.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- olhacks.php.in	5 Feb 2006 20:02:03 -0000	1.1
+++ olhacks.php.in	5 Feb 2006 20:15:10 -0000	1.2
@@ -18,7 +18,7 @@
  *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
  */
 
-require_once 'kolabfilter/misc.php';
+require_once '@kolab_php_module_prefix at kolabfilter/misc.php';
 require_once HORDE_BASE . '/lib/core.php';
 require_once 'Horde/iCalendar.php';
 require_once 'Horde/NLS.php';

Index: resmgr.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- resmgr.php.in	5 Feb 2006 20:02:03 -0000	1.1
+++ resmgr.php.in	5 Feb 2006 20:15:10 -0000	1.2
@@ -18,7 +18,7 @@
  *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
  */
 
-require_once 'kolabfilter/misc.php';
+require_once '@kolab_php_module_prefix at kolabfilter/misc.php';
 
 // What actions we can take when receiving an event request
 define('RM_ACT_ALWAYS_ACCEPT',              1);
@@ -43,7 +43,7 @@
 require_once 'Horde/MIME/Structure.php';
 //include_once 'Horde/Kolab.php';
 require_once 'Horde/Text.php';
-require_once 'freebusy/recurrence.class.php';
+require_once '@kolab_php_module_prefix at freebusy/recurrence.class.php';
 
 // Globals
 $imap = NULL;



From cvs at intevation.de  Sun Feb  5 21:34:22 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  5 Feb 2006 21:34:22 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog, 1.60, 1.61 Makefile.am, 1.17,
	1.18 
Message-ID: <20060205203422.5D6821006B0@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Remove "+" in chmod command.
patch from Raphael Langerhorst, see issue:
https://intevation.de/roundup/kolab/issue1105.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- ChangeLog	5 Feb 2006 17:51:31 -0000	1.60
+++ ChangeLog	5 Feb 2006 20:34:20 -0000	1.61
@@ -1,4 +1,9 @@
 2006-02-05 Richard Bos <richard at radoeka.nl>
+	* Makefile.am: patch from Raphael Langerhorst, see issue:
+	  https://intevation.de/roundup/kolab/issue1105.
+	  Remove "+" in chmod command.
+
+2006-02-05 Richard Bos <richard at radoeka.nl>
 	* dist_conf/common, dist_conf/kolab, dist_conf/suse'
 	  templates/session_vars.php.template.in: introduce a new build
 	  variable: kolab_php_module_prefix.  This variable makes it possible

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Makefile.am	15 Jan 2006 20:32:47 -0000	1.17
+++ Makefile.am	5 Feb 2006 20:34:20 -0000	1.18
@@ -548,18 +548,18 @@
 	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)$(webserver_web_prefix)/freebusy
 	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_sessions)
 #	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)$(webserver_web_prefix)/locks
-	chmod +775 $(DESTDIR)$(kolabdir)$(kolab_FILES)
-	chmod +600 $(DESTDIR)$(kolabconfigdir)/kolab.conf
-	chmod +744 $(DESTDIR)$(kolabnamespacedir)/*
-	chmod +744 $(DESTDIR)$(sbindir)/kolabd
-	chmod +744 $(DESTDIR)$(sbindir)/kolabconf
-	chmod +744 $(DESTDIR)$(sbindir)/kolabcheckperm
-	chmod +755 $(DESTDIR)$(bindir)/kolabpasswd
+	chmod 775 $(DESTDIR)$(kolabdir)$(kolab_FILES)
+	chmod 600 $(DESTDIR)$(kolabconfigdir)/kolab.conf
+	chmod 744 $(DESTDIR)$(kolabnamespacedir)/*
+	chmod 744 $(DESTDIR)$(sbindir)/kolabd
+	chmod 744 $(DESTDIR)$(sbindir)/kolabconf
+	chmod 744 $(DESTDIR)$(sbindir)/kolabcheckperm
+	chmod 755 $(DESTDIR)$(bindir)/kolabpasswd
 if ! OPENPKG
-	chmod +755 $(DESTDIR)$(sbindir)/kolabsrv
+	chmod 755 $(DESTDIR)$(sbindir)/kolabsrv
 endif
 if OPENPKG
-	chmod +755 $(DESTDIR)$(kolabrcdir)/$(kolabrc_DATA)
-	chmod +744 $(DESTDIR)$(bindir)/kolab
+	chmod 755 $(DESTDIR)$(kolabrcdir)/$(kolabrc_DATA)
+	chmod 744 $(DESTDIR)$(bindir)/kolab
 endif
 



From cvs at intevation.de  Sun Feb  5 21:57:30 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  5 Feb 2006 21:57:30 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf suse,1.36,1.37 
Message-ID: <20060205205730.751D61005D1@lists.intevation.de>

Author: richard

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

Modified Files:
	suse 
Log Message:
/var/lib/kolab seems more appropriate for suse than just /var/kolab

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- suse	5 Feb 2006 17:52:49 -0000	1.36
+++ suse	5 Feb 2006 20:57:28 -0000	1.37
@@ -86,7 +86,7 @@
 imap_lmtp=${imap_statedir}/lmtp
 imap_rpm=cyrus-imapd
 
-kolab_statedir=${localstatedir}/kolab
+kolab_statedir=${localstatedir}/lib/kolab
 kolab_logdir=${localstatedir}/log
 kolab_pidfile=${sysrundir}/kolab.pid
 kolab_mailboxuiddb=${kolab_statedir}/mailbox-uidcache.db



From cvs at intevation.de  Mon Feb  6 20:51:23 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon,  6 Feb 2006 20:51:23 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog, 1.61, 1.62 Makefile.am, 1.18,
	1.19 
Message-ID: <20060206195123.A7BC81005A4@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
create the kolab_statedir directory, during make

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- ChangeLog	5 Feb 2006 20:34:20 -0000	1.61
+++ ChangeLog	6 Feb 2006 19:51:21 -0000	1.62
@@ -1,3 +1,7 @@
+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.
+
 2006-02-05 Richard Bos <richard at radoeka.nl>
 	* Makefile.am: patch from Raphael Langerhorst, see issue:
 	  https://intevation.de/roundup/kolab/issue1105.

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Makefile.am	5 Feb 2006 20:34:20 -0000	1.18
+++ Makefile.am	6 Feb 2006 19:51:21 -0000	1.19
@@ -547,6 +547,7 @@
 	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)$(webserver_web_prefix)/icons
 	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)$(webserver_web_prefix)/freebusy
 	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_sessions)
+	$(mkinstalldirs) -m 755 $(DESTDIR)$(kolab_statedir)
 #	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)$(webserver_web_prefix)/locks
 	chmod 775 $(DESTDIR)$(kolabdir)$(kolab_FILES)
 	chmod 600 $(DESTDIR)$(kolabconfigdir)/kolab.conf



From cvs at intevation.de  Tue Feb  7 12:33:37 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue,  7 Feb 2006 12:33:37 +0100 (CET)
Subject: thomas: server/kolabd/kolabd/templates amavisd.conf.template, 1.6.2.1,
	1.6.2.2 
Message-ID: <20060207113337.B54C41005BB@lists.intevation.de>

Author: thomas

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

Modified Files:
      Tag: kolab_2_0_branch
	amavisd.conf.template 
Log Message:
Use amavisd.log instead of amavis.log as log file to fix logrotate (Issue1015).


Index: amavisd.conf.template
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/Attic/amavisd.conf.template,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -d -r1.6.2.1 -r1.6.2.2
--- amavisd.conf.template	11 Jan 2006 14:37:29 -0000	1.6.2.1
+++ amavisd.conf.template	7 Feb 2006 11:33:35 -0000	1.6.2.2
@@ -272,7 +272,7 @@
 #$SYSLOG_LEVEL = 'user.info';     # (facility.priority, default 'mail.info')
 
 # Log file (if not using syslog)
-$LOGFILE = "$MYHOME/amavis.log"; # (defaults to empty, no log)
+$LOGFILE = "$MYHOME/amavisd.log"; # (defaults to empty, no log)
 
 #NOTE: levels are not strictly observed and are somewhat arbitrary
 # 0: startup/exit/failure messages, viruses detected



From cvs at intevation.de  Tue Feb  7 12:33:37 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue,  7 Feb 2006 12:33:37 +0100 (CET)
Subject: thomas: server/kolabd/kolabd ChangeLog,1.1.1.1,1.1.1.1.2.1 
Message-ID: <20060207113337.B35F01005B7@lists.intevation.de>

Author: thomas

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

Modified Files:
      Tag: kolab_2_0_branch
	ChangeLog 
Log Message:
Use amavisd.log instead of amavis.log as log file to fix logrotate (Issue1015).


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -d -r1.1.1.1 -r1.1.1.1.2.1
--- ChangeLog	23 Nov 2004 20:26:47 -0000	1.1.1.1
+++ ChangeLog	7 Feb 2006 11:33:35 -0000	1.1.1.1.2.1
@@ -1,3 +1,8 @@
+2006-02-07  Thomas Arendsen Hein  <thomas at intevation.de>
+
+	* templates/amavisd.conf.template: Use amavisd.log instead of
+	  amavis.log as log file to fix logrotate (Issue1015).
+
 2004-07-12  Martin Konold <martin.konold at erfrakon.de>
         * Added multiple sanity checks (running services etc.)
 



From cvs at intevation.de  Tue Feb  7 12:41:09 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue,  7 Feb 2006 12:41:09 +0100 (CET)
Subject: thomas: server/kolabd/kolabd ChangeLog,1.62,1.63 
Message-ID: <20060207114109.24D161005B7@lists.intevation.de>

Author: thomas

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

Modified Files:
	ChangeLog 
Log Message:
dist_conf/kolab: Use amavisd.log instead of amavis.log as log file
to fix logrotate in OpenPKG installation (Issue1015).


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- ChangeLog	6 Feb 2006 19:51:21 -0000	1.62
+++ ChangeLog	7 Feb 2006 11:41:07 -0000	1.63
@@ -1,3 +1,8 @@
+2006-02-07  Thomas Arendsen Hein  <thomas at intevation.de>
+
+	* 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>
 	Patch committed by Richard Bos
 	* Makefile.am: create the kolab_statedir directory, during make.



From cvs at intevation.de  Tue Feb  7 12:41:09 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue,  7 Feb 2006 12:41:09 +0100 (CET)
Subject: thomas: server/kolabd/kolabd/dist_conf kolab,1.27,1.28 
Message-ID: <20060207114109.299861005BB@lists.intevation.de>

Author: thomas

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

Modified Files:
	kolab 
Log Message:
dist_conf/kolab: Use amavisd.log instead of amavis.log as log file
to fix logrotate in OpenPKG installation (Issue1015).


Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- kolab	5 Feb 2006 17:51:31 -0000	1.27
+++ kolab	7 Feb 2006 11:41:07 -0000	1.28
@@ -34,7 +34,7 @@
 
 amavisd_conffile=${sysconfdir}/amavisd/amavisd.conf
 amavisd_templatedir=${sysconfdir}/amavisd/templates
-amavisd_logfile=${localstatedir}/amavisd/amavis.log
+amavisd_logfile=${localstatedir}/amavisd/amavisd.log
 amavisd_home=${localstatedir}/amavisd
 # @l_rusr@
 amavisd_rusr=kolab-r



From cvs at intevation.de  Wed Feb  8 21:29:33 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed,  8 Feb 2006 21:29:33 +0100 (CET)
Subject: richard: server/kolabd/kolabd Makefile.am,1.19,1.20 
Message-ID: <20060208202933.E4C0B1006D5@lists.intevation.de>

Author: richard

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

Modified Files:
	Makefile.am 
Log Message:
the lock directory is needed

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Makefile.am	6 Feb 2006 19:51:21 -0000	1.19
+++ Makefile.am	8 Feb 2006 20:29:31 -0000	1.20
@@ -548,7 +548,7 @@
 	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)$(webserver_web_prefix)/freebusy
 	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_sessions)
 	$(mkinstalldirs) -m 755 $(DESTDIR)$(kolab_statedir)
-#	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)$(webserver_web_prefix)/locks
+	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)$(webserver_web_prefix)/locks
 	chmod 775 $(DESTDIR)$(kolabdir)$(kolab_FILES)
 	chmod 600 $(DESTDIR)$(kolabconfigdir)/kolab.conf
 	chmod 744 $(DESTDIR)$(kolabnamespacedir)/*



From cvs at intevation.de  Fri Feb 10 07:49:24 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri, 10 Feb 2006 07:49:24 +0100 (CET)
Subject: martin: doc/www/src index.html.m4,1.75,1.76 
Message-ID: <20060210064924.B4C9F100161@lists.intevation.de>

Author: martin

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

Modified Files:
	index.html.m4 
Log Message:
Martin Konold: Added news about Kolab at CeBIT. Please add further booths where Kolab is presented asap.


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- index.html.m4	28 Jan 2006 18:22:00 -0000	1.75
+++ index.html.m4	10 Feb 2006 06:49:22 -0000	1.76
@@ -46,6 +46,20 @@
 <!-- BEGIN LATEST BLOCK --> <div class="latestnews">
 
 <table>
+<tr><td class="newsd">February 10th, 2006</td>
+<td class="newsh">&raquo;
+        Kolab at CeBIT 2006 Fair in Hannover, Germany
+</td></tr>
+</table>
+<div class="newsb">
+      Kolab Groupware will be at the world largest computer fair
+      CeBIT (March 9–15, 2006).
+      Visit Kolab in hall 4, booth F52 sponsered by 
+      <a href="http://www.credativ.de">Credativ</a>.
+</div>
+<p>
+
+<table>
 <tr><td class="newsd">January 13th, 2006</td>
 <td class="newsh">&raquo;
 	Security Advisory 08 for Kolab Server



From cvs at intevation.de  Fri Feb 10 13:52:06 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri, 10 Feb 2006 13:52:06 +0100 (CET)
Subject: martin: doc/www/src index.html.m4,1.76,1.77 
Message-ID: <20060210125206.300F4100159@lists.intevation.de>

Author: martin

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

Modified Files:
	index.html.m4 
Log Message:
MArtin Konold: Fix html encoding


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- index.html.m4	10 Feb 2006 06:49:22 -0000	1.76
+++ index.html.m4	10 Feb 2006 12:52:03 -0000	1.77
@@ -53,7 +53,7 @@
 </table>
 <div class="newsb">
       Kolab Groupware will be at the world largest computer fair
-      CeBIT (March 9–15, 2006).
+      CeBIT (March 9th &minus; 15th, 2006).
       Visit Kolab in hall 4, booth F52 sponsered by 
       <a href="http://www.credativ.de">Credativ</a>.
 </div>



From cvs at intevation.de  Mon Feb 13 03:35:02 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon, 13 Feb 2006 03:35:02 +0100 (CET)
Subject: martin: server/kolabd/kolabd/templates imapd.conf.template.in, 1.4,
	1.5 
Message-ID: <20060213023502.781B51005A5@lists.intevation.de>

Author: martin

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

Modified Files:
	imapd.conf.template.in 
Log Message:
Martin Konold: Fixing scalability issue 1089 by adding "hashimapspool: yes" to imapd.conf


Index: imapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/imapd.conf.template.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- imapd.conf.template.in	22 Nov 2005 23:01:46 -0000	1.4
+++ imapd.conf.template.in	13 Feb 2006 02:34:59 -0000	1.5
@@ -43,6 +43,11 @@
 unixhierarchysep:       yes
 lmtp_downcase_rcpt:	yes
 username_tolower:       1
+
+hashimapspool:          yes
+#the fulldirhash optimization requires the rehash utility and the compile time switch --enable-fulldirhash
+#fulldirhash:           yes
+
 ##virtdomains:            userid
 
 loginrealms:		@@@postfix-mydomain@@@ @@@postfix-mydestination|join( )@@@



From cvs at intevation.de  Mon Feb 13 03:59:45 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon, 13 Feb 2006 03:59:45 +0100 (CET)
Subject: martin: server/kolabd/kolabd/templates imapd.conf.template.in, 1.5,
	1.6 
Message-ID: <20060213025945.B985A1005A5@lists.intevation.de>

Author: martin

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

Modified Files:
	imapd.conf.template.in 
Log Message:
Martin Konold: Issue 1101 (removed support for useless apop)


Index: imapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/imapd.conf.template.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- imapd.conf.template.in	13 Feb 2006 02:34:59 -0000	1.5
+++ imapd.conf.template.in	13 Feb 2006 02:59:43 -0000	1.6
@@ -35,6 +35,8 @@
 sievedir:		@imap_sievedir@
 lmtpsocket: 		@emailserver_socket@
 
+allowapop:              no
+
 #tls_ca_file: 		@sysconfdir@/kolab/server.pem
 tls_cert_file: 		@sysconfdir@/kolab/cert.pem
 tls_key_file: 		@sysconfdir@/kolab/key.pem



From cvs at intevation.de  Mon Feb 13 13:05:48 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon, 13 Feb 2006 13:05:48 +0100 (CET)
Subject: bernhard: doc/raw-howtos moving-mailboxes.txt,1.4,1.5 
Message-ID: <20060213120548.92E0D1005A3@lists.intevation.de>

Author: bernhard

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

Modified Files:
	moving-mailboxes.txt 
Log Message:
Added renaming usecase and mention of pitfall with quota roots,
if the cyrus.header files are not deleted.


Index: moving-mailboxes.txt
===================================================================
RCS file: /kolabrepository/doc/raw-howtos/moving-mailboxes.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- moving-mailboxes.txt	18 Aug 2005 13:16:48 -0000	1.4
+++ moving-mailboxes.txt	13 Feb 2006 12:05:46 -0000	1.5
@@ -10,7 +10,7 @@
 kolabHomeServer is actually populated.
 
 Sometimes users shall be migrated to another server for many reasons including 
-relocation of the user, maintainance or security. 
+relocation of the user, maintainance, renaming or security. 
 This can be achieved by two methods.
 
 Method 1: Do it the direct but brutal way (Shell access)
@@ -26,6 +26,10 @@
 
 - run cyrus reconstruct on the target server. 
   (Hint: You need to run cyrreconstruct as the right user, e.g. su - kolab-r.)
+  It might be necessary to delete the cyrus.* files within the directories
+  before cyrreconstruct or afterwards and then running it again.
+  E.g when renaming the old cyrus.header files will lead 
+  to the wrong quota root be written into the mailboxes database.
 
 - check that the copy is working and complete
 



From cvs at intevation.de  Tue Feb 14 16:00:37 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 14 Feb 2006 16:00:37 +0100 (CET)
Subject: bernhard: doc/www/src index.html.m4,1.77,1.78 
Message-ID: <20060214150037.680D31005B8@lists.intevation.de>

Author: bernhard

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

Modified Files:
	index.html.m4 
Log Message:
Added second location where KDE will show Kolab (with Kontact).
Added hint how people can reach somebody from the KK on CeBit.


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- index.html.m4	10 Feb 2006 12:52:03 -0000	1.77
+++ index.html.m4	14 Feb 2006 15:00:35 -0000	1.78
@@ -54,8 +54,10 @@
 <div class="newsb">
       Kolab Groupware will be at the world largest computer fair
       CeBIT (March 9th &minus; 15th, 2006).
-      Visit Kolab in hall 4, booth F52 sponsered by 
-      <a href="http://www.credativ.de">Credativ</a>.
+      Visit Kolab in hall 5 (near booth F56) and hall 4, booth F52.
+      Both time Kolab is a guest of the KDE Project. On selected days,
+      someone from the Kolab-Konsortium will visit the fair. So if you 
+      want to talk to KK: Schedule an appointment in advance.
 </div>
 <p>
 



From cvs at intevation.de  Wed Feb 15 18:47:19 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 15 Feb 2006 18:47:19 +0100 (CET)
Subject: wilde: doc/raw-howtos speaking-imap-for-debugging.txt,1.4,1.5 
Message-ID: <20060215174719.2BDC31005A3@lists.intevation.de>

Author: wilde

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

Modified Files:
	speaking-imap-for-debugging.txt 
Log Message:
Added short section on making unencrypted imap connections to a Kolab
server.


Index: speaking-imap-for-debugging.txt
===================================================================
RCS file: /kolabrepository/doc/raw-howtos/speaking-imap-for-debugging.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- speaking-imap-for-debugging.txt	15 Jul 2005 12:56:00 -0000	1.4
+++ speaking-imap-for-debugging.txt	15 Feb 2006 17:47:17 -0000	1.5
@@ -49,3 +49,23 @@
 	
 4. Close session
 	a logout
+
+
+Making insecure connections using toltec
+----------------------------------------
+
+This might be useful for sniffing.
+
+1. Disable SSL/TLS in the toltec settings.
+
+2. Substitute the line @@@cyrus-imap@@@ in cyrus.conf.template with
+   the expanded version as found in cyrus.conf   
+   (simply commenting out @@@cyrus-imap@@@ won't help, you would end up
+   with two imap entries in cyrus.conf)
+
+   Add the option "-p 128" to the imap cmd.
+
+3. /kolab/sbin/kolabconf
+
+You should be now able to connect to the Kolab server without SSL/TLS
+(using AUTH PLAIN) and read the imap traffic in clear text on the wire!



From cvs at intevation.de  Mon Feb 20 14:32:55 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon, 20 Feb 2006 14:32:55 +0100 (CET)
Subject: bernhard: doc/www/src index.html.m4,1.78,1.79 
Message-ID: <20060220133255.5DF571005DB@lists.intevation.de>

Author: bernhard

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

Modified Files:
	index.html.m4 
Log Message:
Added another booth where Kolab can be seen.


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- index.html.m4	14 Feb 2006 15:00:35 -0000	1.78
+++ index.html.m4	20 Feb 2006 13:32:53 -0000	1.79
@@ -54,8 +54,9 @@
 <div class="newsb">
       Kolab Groupware will be at the world largest computer fair
       CeBIT (March 9th &minus; 15th, 2006).
-      Visit Kolab in hall 5 (near booth F56) and hall 4, booth F52.
-      Both time Kolab is a guest of the KDE Project. On selected days,
+      Visit Kolab in hall 5 (KDE booth somewhere close to F56), 
+      hall 5 F58/2 and hall 4, booth F52.
+      On selected days,
       someone from the Kolab-Konsortium will visit the fair. So if you 
       want to talk to KK: Schedule an appointment in advance.
 </div>



From cvs at intevation.de  Mon Feb 20 20:29:45 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon, 20 Feb 2006 20:29:45 +0100 (CET)
Subject: bernhard: utils/admin listannotations.pl,NONE,1.1 
Message-ID: <20060220192945.1DC531005B9@lists.intevation.de>

Author: bernhard

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

Added Files:
	listannotations.pl 
Log Message:
Added listannitations.pl script.


--- NEW FILE: listannotations.pl ---
# uncomfortable example script to read out the annotations for a user
# 	user.a at old.example.org
# in order to create a script that can re-add them for a different domain
# and different user name.
#
# Example usage to get the file "lines" that contains the commands
# to set the annotations for user.b at new.example.org again:
#
# /kolab/bin/perl listannotations.pl | \
#                grep /vendor/kolab/ | \
#                sed "s+/mailbox/{\(.*\)}/vendor/kolab/\(folder-type\|incidences-for\):::\(.*\)+\$client->mboxconfig('\1', '/vendor/kolab/\2', '\3');+" | \
#		 sed "s+user.b\(.*\)@old.example.org+user.b\1 at new.example.org+" >lines
# 
#
#  20060220 initial bernhard at intevation.de	
#  	Tested with Kolab Server 2.1.0beta1.
#
#  This script is Free Software. 
# $Id: listannotations.pl,v 1.1 2006/02/20 19:29:42 bernhard Exp $

use Cyrus::IMAP::Admin;

my $client = Cyrus::IMAP::Admin->new('localhost',);
$client->authenticate(-user => 'manager', -password => 'XXXXXXX');

%info= $client->getinfo('user/user.a*@old.example.org');
foreach my $attrib (sort keys %info) {
	print $attrib.":::". $info{$attrib}."\n";
	}

#$client->mboxconfig('user/user.b at new.example.org','/vendor/kolab/folder-type','mail');

# insert "lines" here and rename script to "setannotations.local.pl" or so. :)



From cvs at intevation.de  Mon Feb 20 23:21:01 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon, 20 Feb 2006 23:21:01 +0100 (CET)
Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user
	user.php.in, 1.3, 1.4 
Message-ID: <20060220222101.2DCCA1005CF@lists.intevation.de>

Author: steffen

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

Modified Files:
	user.php.in 
Log Message:
fixlet

Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- user.php.in	5 Feb 2006 20:13:55 -0000	1.3
+++ user.php.in	20 Feb 2006 22:20:59 -0000	1.4
@@ -1,6 +1,6 @@
 <?php
 /*
- (c) 2004 Klarlvdalens Datakonsult AB
+ (c) 2004-2006 Klaraelvdalens Datakonsult AB
  (c) 2004 Martin Konold erfrakon <martin.konold at erfrakon.de>
  This program is Free Software under the GNU General Public License (>=v2).
  Read the file COPYING that comes with this packages for details.
@@ -789,7 +789,7 @@
 	 if( ldap_mod_del( $ldap->connection, $distlist['dn'], array('member' => $dn ) ) ) {
 	   $messages[] = sprintf(_("Account removed from distribution list '%s'."), $dlmail);
 	 } else {
-	   $errors[] = sprintf(_("Failure to remove account from distribution list '', account will not be deleted."),
+	   $errors[] = sprintf(_("Failure to remove account from distribution list '%s', account will not be deleted."),
 						   $dlmail);
 	   break;
 	 }



From cvs at intevation.de  Tue Feb 21 03:32:41 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 21 Feb 2006 03:32:41 +0100 (CET)
Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/addressbook
	addr.php.in, 1.1, 1.2 
Message-ID: <20060221023241.6101C1005CF@lists.intevation.de>

Author: steffen

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

Modified Files:
	addr.php.in 
Log Message:
Fix for issue848 (external address in dist. list)

Index: addr.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook/addr.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- addr.php.in	5 Feb 2006 20:13:55 -0000	1.1
+++ addr.php.in	21 Feb 2006 02:32:39 -0000	1.2
@@ -241,20 +241,17 @@
 	}
 	break;
   case 'modify':
-	$result = $ldap->search( $dn, '(objectClass=inetOrgPerson)' );
-	if( $result ) {
-	  $ldap_object = ldap_get_entries( $ldap->connection, $result );
-	  if( $ldap_object['count'] == 1 ) {
-		fill_form_for_modify( $form, $ldap_object[0] );
-		$form->entries['action']['value'] = 'save';
-		$form->entries['dn'] = array( 'name' => 'dn',
-									  'type' => 'hidden',
-									  'value' => $dn );
-		$heading = _('Modify External Address'); 
-		$content = $form->outputForm();
-	  } else {
-		array_push($errors, sprintf(_("Error: Multiple results returned for DN %s"), $dn) );
-	  }
+	$ldap_object = $ldap->read( $dn );
+	if( $ldap_object ) {
+	  fill_form_for_modify( $form, $ldap_object );
+	  $form->entries['action']['value'] = 'save';
+	  $form->entries['dn'] = array( 'name' => 'dn',
+									'type' => 'hidden',
+									'value' => $dn );
+	  $heading = _('Modify External Address'); 
+	  $content = $form->outputForm();
+	} else {
+	  array_push($errors, sprintf(_("Error: No entry with DN %s found"), $dn) );
 	}
 	break;
   case 'delete':
@@ -263,24 +260,46 @@
 		$form->entries[$k]['attrs'] = 'readonly';
 	  }
 	}
-	$result = $ldap->search( $dn, '(objectClass=*)' );
-	if( $result ) {
-	  $ldap_object = ldap_get_entries( $ldap->connection, $result );
-	  if( $ldap_object['count'] == 1 ) {
-		fill_form_for_modify( $form, $ldap_object[0] );
-		$form->entries['action']['value'] = 'kill';
-		foreach( array_keys($form->entries) as $key ) {
-		  $form->entries[$key]['attrs'] = 'readonly';
-		}
-		$form->submittext = _('Delete');
-		$heading = _('Delete External Address');
-		$content = $form->outputForm();
-	  } else {
-		array_push($errors, sprintf(_("Error: Multiple results returned for DN %s"), $dn) );
+	$ldap_object = $ldap->read( $dn );
+	if( $ldap_object ) {
+	  fill_form_for_modify( $form, $ldap_object );
+	  $form->entries['action']['value'] = 'kill';
+	  foreach( array_keys($form->entries) as $key ) {
+		$form->entries[$key]['attrs'] = 'readonly';
 	  }
+	  $form->submittext = _('Delete');
+	  $heading = _('Delete External Address');
+	  $content = $form->outputForm();
+	} else {
+	  array_push($errors, sprintf(_("Error: No entry with DN %s found"), $dn) );
 	}
 	break;
   case 'kill':
+	// Check for distribution lists with only this user as member
+	$ldap->search( $_SESSION['base_dn'], 
+				   '(&(objectClass=kolabGroupOfNames)(member='.$ldap->escape($dn).'))',
+				   array( 'dn', 'cn', 'mail', 'member' ) );
+	$distlists = $ldap->getEntries();
+	unset($distlists['count']);
+	foreach( $distlists as $distlist ) {
+	  $dlmail = $distlist['mail'][0];
+	  if( !$dlmail ) $dlmail = $distlist['cn'][0]; # Compatibility with old stuff
+	  if( $distlist['member']['count'] == 1 ) {
+		$errors[] = sprintf(_("Account could not be deleted, distribution list '%s' depends on it."), $dlmail);
+	  }
+	}
+	if( !$errors ) foreach( $distlists as $distlist ) {
+	  $dlmail = $distlist['mail'][0];
+	  if( !$dlmail ) $dlmail = $distlist['cn'][0]; # Compatibility with old stuff
+	  if( ldap_mod_del( $ldap->connection, $distlist['dn'], array('member' => $dn ) ) ) {
+		$messages[] = sprintf(_("Addressbook entry removed from distribution list '%s'."), $dlmail);
+	  } else {
+		$errors[] = sprintf(_("Failure to remove addressbook entry from distribution list '%s', entry will not be deleted."),
+							$dlmail);
+		break;
+	  }
+	}
+	
 	if (!$errors) {    
 	  if (!($ldap->deleteObject($dn))) {
 		array_push($errors, sprintf(_("LDAP Error: could not delete %s: %s"),$dn,



From cvs at intevation.de  Tue Feb 21 03:33:09 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 21 Feb 2006 03:33:09 +0100 (CET)
Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/addressbook
	addr.php, 1.10.2.3, 1.10.2.4 
Message-ID: <20060221023309.1564A1005CF@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	addr.php 
Log Message:
Backport of: Fix for issue848 (external address in dist. list)

Index: addr.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook/Attic/addr.php,v
retrieving revision 1.10.2.3
retrieving revision 1.10.2.4
diff -u -d -r1.10.2.3 -r1.10.2.4
--- addr.php	13 Oct 2005 01:50:25 -0000	1.10.2.3
+++ addr.php	21 Feb 2006 02:33:07 -0000	1.10.2.4
@@ -238,20 +238,17 @@
 	}
 	break;
   case 'modify':
-	$result = $ldap->search( $dn, '(objectClass=inetOrgPerson)' );
-	if( $result ) {
-	  $ldap_object = ldap_get_entries( $ldap->connection, $result );
-	  if( $ldap_object['count'] == 1 ) {
-		fill_form_for_modify( $form, $ldap_object[0] );
-		$form->entries['action']['value'] = 'save';
-		$form->entries['dn'] = array( 'name' => 'dn',
-									  'type' => 'hidden',
-									  'value' => $dn );
-		$heading = _('Modify External Address'); 
-		$content = $form->outputForm();
-	  } else {
-		array_push($errors, sprintf(_("Error: Multiple results returned for DN %s"), $dn) );
-	  }
+	$ldap_object = $ldap->read( $dn );
+	if( $ldap_object ) {
+	  fill_form_for_modify( $form, $ldap_object );
+	  $form->entries['action']['value'] = 'save';
+	  $form->entries['dn'] = array( 'name' => 'dn',
+									'type' => 'hidden',
+									'value' => $dn );
+	  $heading = _('Modify External Address'); 
+	  $content = $form->outputForm();
+	} else {
+	  array_push($errors, sprintf(_("Error: No entry with DN %s found"), $dn) );
 	}
 	break;
   case 'delete':
@@ -260,24 +257,46 @@
 		$form->entries[$k]['attrs'] = 'readonly';
 	  }
 	}
-	$result = $ldap->search( $dn, '(objectClass=*)' );
-	if( $result ) {
-	  $ldap_object = ldap_get_entries( $ldap->connection, $result );
-	  if( $ldap_object['count'] == 1 ) {
-		fill_form_for_modify( $form, $ldap_object[0] );
-		$form->entries['action']['value'] = 'kill';
-		foreach( array_keys($form->entries) as $key ) {
-		  $form->entries[$key]['attrs'] = 'readonly';
-		}
-		$form->submittext = _('Delete');
-		$heading = _('Delete External Address');
-		$content = $form->outputForm();
-	  } else {
-		array_push($errors, sprintf(_("Error: Multiple results returned for DN %s"),$dn) );
+	$ldap_object = $ldap->read($dn);
+	if( $ldap_object ) {
+	  fill_form_for_modify( $form, $ldap_object );
+	  $form->entries['action']['value'] = 'kill';
+	  foreach( array_keys($form->entries) as $key ) {
+		$form->entries[$key]['attrs'] = 'readonly';
 	  }
+	  $form->submittext = _('Delete');
+	  $heading = _('Delete External Address');
+	  $content = $form->outputForm();
+	} else {
+	  array_push($errors, sprintf(_("Error: No entry with DN %s found"), $dn) );
 	}
 	break;
   case 'kill':
+	// Check for distribution lists with only this user as member
+	$ldap->search( $_SESSION['base_dn'],
+				   '(&(objectClass=kolabGroupOfNames)(member='.$ldap->escape($dn).'))',
+				   array( 'dn', 'cn', 'mail', 'member' ) );
+	$distlists = $ldap->getEntries();
+	unset($distlists['count']);
+	foreach( $distlists as $distlist ) {
+	  $dlmail = $distlist['mail'][0];
+	  if( !$dlmail ) $dlmail = $distlist['cn'][0]; # Compatibility with old stuff
+	  if( $distlist['member']['count'] == 1 ) {
+		$errors[] = sprintf(_("Account could not be deleted, distribution list '%s' depends on it."), $dlmail);
+	  }
+	}
+	if( !$errors ) foreach( $distlists as $distlist ) {
+	  $dlmail = $distlist['mail'][0];
+	  if( !$dlmail ) $dlmail = $distlist['cn'][0]; # Compatibility with old stuff
+	  if( ldap_mod_del( $ldap->connection, $distlist['dn'], array('member' => $dn ) ) ) {
+		$messages[] = sprintf(_("Addressbook entry removed from distribution list '%s'."), $dlmail);
+	  } else {
+		$errors[] = sprintf(_("Failure to remove addressbook entry from distribution list '%s', entry will not be deleted."),
+							$dlmail);
+		break;
+	  }
+	}
+	
 	if (!$errors) {    
 	  if (!($ldap->deleteObject($dn))) {
 		array_push($errors, _("LDAP Error: could not delete ").$dn.": ".ldap_error($ldap->connection));



From cvs at intevation.de  Tue Feb 21 11:26:03 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 21 Feb 2006 11:26:03 +0100 (CET)
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr
	kolabfilter.php.in, 1.6, 1.7 kolabmailboxfilter.php.in, 1.4,
	1.5 kolabmailtransport.php, 1.5, 1.6 
Message-ID: <20060221102603.A486B1005CF@lists.intevation.de>

Author: steffen

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

Modified Files:
	kolabfilter.php.in kolabmailboxfilter.php.in 
	kolabmailtransport.php 
Log Message:
Hopefully fixes issue1042 (dotstuffing in kolabfilter)

Index: kolabfilter.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabfilter.php.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- kolabfilter.php.in	5 Feb 2006 20:15:10 -0000	1.6
+++ kolabfilter.php.in	21 Feb 2006 10:26:01 -0000	1.7
@@ -399,6 +399,15 @@
 }
 while (!feof($tmpf) ) {
     $buffer = fread($tmpf, 8192);
+    $len = strlen($buffer);
+
+    /* We can't tolerate that the buffer breaks the data
+       between \r and \n, so we try to avoid that. The limit 
+       of 100 reads is to battle abuse */
+    while( $buffer{$len-1} == "\r" && $len < 8192 + 100 ) {
+      $buffer .= fread($tmpf,1);
+      $len++;
+    }
     if( PEAR::isError($error = $smtp->data( $buffer )) ) {
         fwrite(STDOUT, $error->getMessage().", code ".$error->getCode()."\n"); 
 	if( $error->getCode() < 500 ) exit(EX_TEMPFAIL);

Index: kolabmailboxfilter.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabmailboxfilter.php.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kolabmailboxfilter.php.in	5 Feb 2006 20:15:10 -0000	1.4
+++ kolabmailboxfilter.php.in	21 Feb 2006 10:26:01 -0000	1.5
@@ -153,6 +153,15 @@
 }
 while (!feof($tmpf) ) {
     $buffer = fread($tmpf, 8192);
+    $len = strlen($buffer);
+
+    /* We can't tolerate that the buffer breaks the data
+       between \r and \n, so we try to avoid that. The limit 
+       of 100 reads is to battle abuse */
+    while( $buffer{$len-1} == "\r" && $len < 8192 + 100 ) {
+      $buffer .= fread($tmpf,1);
+      $len++;
+    }
     if( PEAR::isError($error = $lmtp->data( $buffer )) ) {
 	fwrite(STDOUT, $error->getMessage().", code ".$error->getCode()."\n"); 
 	if( $error->getCode() < 500 ) exit(EX_TEMPFAIL);

Index: kolabmailtransport.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabmailtransport.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kolabmailtransport.php	22 Dec 2005 17:52:53 -0000	1.5
+++ kolabmailtransport.php	21 Feb 2006 10:26:01 -0000	1.6
@@ -2,7 +2,7 @@
 /*
  *  Copyright (c) 2005 Klaraelvdalens Datakonsult AB
  *
- *    Writen by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
+ *    Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
  *
  *  This  program is free  software; you can redistribute  it and/or
  *  modify it  under the terms of the GNU  General Public License as
@@ -32,7 +32,7 @@
   function start($sender,$recips) {
     $this->createTransport();
     $myclass = get_class($this->transport);
-    $this->got_newline = false;
+    $this->got_newline = true;
 
     if (!$this->transport) {
       return new PEAR_Error('Failed to connect to $myclass: ' . $error->getMessage(), 421);
@@ -47,7 +47,7 @@
     
     if( !is_array( $recips ) ) $recips = array($recips);
 
-	$reciperrors = array();
+    $reciperrors = array();
     foreach( $recips as $recip ) {
       if (PEAR::isError($error = $this->transport->rcptTo($recip))) {
 		$msg = "Failed to set recipient $recip: " . $error->getMessage(). ", code=".$this->transport->_code;;
@@ -95,9 +95,11 @@
      * Change Unix (\n) and Mac (\r) linefeeds into Internet-standard CRLF
      * (\r\n) linefeeds.
      */
-    $data = preg_replace("/([^\r]{1})\n/", "\\1\r\n", $data);
-    $data = preg_replace("/\n\n/", "\n\r\n", $data);
-    
+    //$data = preg_replace("/([^\r]{1})\n/", "\\1\r\n", $data);
+    //$data = preg_replace("/\n\n/", "\n\r\n", $data);
+    $data = preg_replace(array('/(?<!\r)\n/','/\r(?!\n)/'), "\r\n", $data);
+    //$data = preg_replace(array('/(?<!\r)\n/','/\r(?!\n)/'), "\n", $data);
+
     /*
      * Because a single leading period (.) signifies an end to the data,
      * legitimate leading periods need to be "doubled" (e.g. '..').



From cvs at intevation.de  Tue Feb 21 12:58:36 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 21 Feb 2006 12:58:36 +0100 (CET)
Subject: steffen: server/kolab-resource-handlers Makefile, 1.9.2.1,
	1.9.2.2 kolab-resource-handlers.spec, 1.126.2.12, 1.126.2.13 
Message-ID: <20060221115836.B0D771005AB@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	Makefile kolab-resource-handlers.spec 
Log Message:
Backport of: Fix for issue1042 (dotstuffing in kolabfilter)

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/Makefile,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -d -r1.9.2.1 -r1.9.2.2
--- Makefile	11 Jan 2006 04:38:01 -0000	1.9.2.1
+++ Makefile	21 Feb 2006 11:58:34 -0000	1.9.2.2
@@ -4,7 +4,7 @@
 
 PACKAGE=kolab-resource-handlers
 VERSION = 0.3.9
-RELEASE=20060111
+RELEASE=20060221
 PEARVERSION = 1.3
 
 RPM = /kolab/bin/openpkg rpm

Index: kolab-resource-handlers.spec
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v
retrieving revision 1.126.2.12
retrieving revision 1.126.2.13
diff -u -d -r1.126.2.12 -r1.126.2.13
--- kolab-resource-handlers.spec	11 Jan 2006 04:38:01 -0000	1.126.2.12
+++ kolab-resource-handlers.spec	21 Feb 2006 11:58:34 -0000	1.126.2.13
@@ -8,7 +8,7 @@
 URL:		http://www.kolab.org/
 Packager:	Steffen Hansen <steffen at klaralvdalens-datakonsult.se> (Klaraelvdalens Datakonsult AB)
 Version:	%{V_kolab_reshndl}
-Release:	20060111
+Release:	20060221
 Class:		JUNK
 License:	GPL
 Group:		MAIL



From cvs at intevation.de  Tue Feb 21 12:58:36 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 21 Feb 2006 12:58:36 +0100 (CET)
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr
	kolabfilter.php, 1.26.2.2, 1.26.2.3 kolabmailboxfilter.php, 1.4,
	1.4.2.1 kolabmailtransport.php, 1.3.2.2, 1.3.2.3 
Message-ID: <20060221115836.BC5BD1006A0@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	kolabfilter.php kolabmailboxfilter.php kolabmailtransport.php 
Log Message:
Backport of: Fix for issue1042 (dotstuffing in kolabfilter)

Index: kolabfilter.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/Attic/kolabfilter.php,v
retrieving revision 1.26.2.2
retrieving revision 1.26.2.3
diff -u -d -r1.26.2.2 -r1.26.2.3
--- kolabfilter.php	11 Jan 2006 04:38:01 -0000	1.26.2.2
+++ kolabfilter.php	21 Feb 2006 11:58:34 -0000	1.26.2.3
@@ -294,6 +294,15 @@
 }
 while (!feof($tmpf) ) {
     $buffer = fread($tmpf, 8192);
+    $len = strlen($buffer);
+
+    /* We can't tolerate that the buffer breaks the data
+       between \r and \n, so we try to avoid that. The limit
+       of 100 reads is to battle abuse */
+    while( $buffer{$len-1} == "\r" && $len < 8192 + 100 ) {
+      $buffer .= fread($tmpf,1);
+      $len++;
+    }
     if( PEAR::isError($error = $smtp->data( $buffer )) ) {
         fwrite(STDOUT, $error->getMessage().", code ".$error->getCode()."\n"); 
 	if( $error->getCode() < 500 ) exit(EX_TEMPFAIL);

Index: kolabmailboxfilter.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/Attic/kolabmailboxfilter.php,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- kolabmailboxfilter.php	17 May 2005 10:25:18 -0000	1.4
+++ kolabmailboxfilter.php	21 Feb 2006 11:58:34 -0000	1.4.2.1
@@ -153,6 +153,15 @@
 }
 while (!feof($tmpf) ) {
     $buffer = fread($tmpf, 8192);
+    $len = strlen($buffer);
+
+    /* We can't tolerate that the buffer breaks the data
+       between \r and \n, so we try to avoid that. The limit
+       of 100 reads is to battle abuse */
+    while( $buffer{$len-1} == "\r" && $len < 8192 + 100 ) {
+      $buffer .= fread($tmpf,1);
+      $len++;
+    }
     if( PEAR::isError($error = $lmtp->data( $buffer )) ) {
 	fwrite(STDOUT, $error->getMessage().", code ".$error->getCode()."\n"); 
 	if( $error->getCode() < 500 ) exit(EX_TEMPFAIL);

Index: kolabmailtransport.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabmailtransport.php,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -d -r1.3.2.2 -r1.3.2.3
--- kolabmailtransport.php	22 Dec 2005 17:48:19 -0000	1.3.2.2
+++ kolabmailtransport.php	21 Feb 2006 11:58:34 -0000	1.3.2.3
@@ -2,7 +2,7 @@
 /*
  *  Copyright (c) 2005 Klaraelvdalens Datakonsult AB
  *
- *    Writen by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
+ *    Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
  *
  *  This  program is free  software; you can redistribute  it and/or
  *  modify it  under the terms of the GNU  General Public License as
@@ -32,7 +32,7 @@
   function start($sender,$recips) {
     $this->createTransport();
     $myclass = get_class($this->transport);
-    $this->got_newline = false;
+    $this->got_newline = true;
 
     if (!$this->transport) {
       return new PEAR_Error('Failed to connect to $myclass: ' . $error->getMessage(), 421);
@@ -47,7 +47,7 @@
     
     if( !is_array( $recips ) ) $recips = array($recips);
 
-	$reciperrors = array();
+    $reciperrors = array();
     foreach( $recips as $recip ) {
       if (PEAR::isError($error = $this->transport->rcptTo($recip))) {
 		$msg = "Failed to set recipient $recip: " . $error->getMessage(). ", code=".$this->transport->_code;;
@@ -93,8 +93,7 @@
      * Change Unix (\n) and Mac (\r) linefeeds into Internet-standard CRLF
      * (\r\n) linefeeds.
      */
-    $data = preg_replace("/([^\r]{1})\n/", "\\1\r\n", $data);
-    $data = preg_replace("/\n\n/", "\n\r\n", $data);
+    $data = preg_replace(array('/(?<!\r)\n/','/\r(?!\n)/'), "\r\n", $data);
     
     /*
      * Because a single leading period (.) signifies an end to the data,



From cvs at intevation.de  Tue Feb 21 13:22:33 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 21 Feb 2006 13:22:33 +0100 (CET)
Subject: bernhard: utils/admin listannotations.pl,1.1,1.2 
Message-ID: <20060221122233.099AF1006AE@lists.intevation.de>

Author: bernhard

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

Modified Files:
	listannotations.pl 
Log Message:
Improved the usage instructions.


Index: listannotations.pl
===================================================================
RCS file: /kolabrepository/utils/admin/listannotations.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- listannotations.pl	20 Feb 2006 19:29:42 -0000	1.1
+++ listannotations.pl	21 Feb 2006 12:22:30 -0000	1.2
@@ -3,14 +3,24 @@
 # in order to create a script that can re-add them for a different domain
 # and different user name.
 #
+# USAGE: 
+#        1) make a copy of the script and replace manager password and user
+#	    with your settings of the old server.
+#	 2) Create the command lines necessary to set the annotations
+#	    on the new server.
+#
 # Example usage to get the file "lines" that contains the commands
-# to set the annotations for user.b at new.example.org again:
+# to set the annotations for user.b at new.example.org:
 #
 # /kolab/bin/perl listannotations.pl | \
 #                grep /vendor/kolab/ | \
 #                sed "s+/mailbox/{\(.*\)}/vendor/kolab/\(folder-type\|incidences-for\):::\(.*\)+\$client->mboxconfig('\1', '/vendor/kolab/\2', '\3');+" | \
-#		 sed "s+user.b\(.*\)@old.example.org+user.b\1 at new.example.org+" >lines
+#		 sed "s+user.a\(.*\)@old.example.org+user.b\1 at new.example.org+" >lines
 # 
+#	3) Make another copy, e.g. name it setannotation.new.pl.
+#	   Add the manager password and user for the new server and
+#	   add the commands to set the annotations from step 2).
+#	   Run it.
 #
 #  20060220 initial bernhard at intevation.de	
 #  	Tested with Kolab Server 2.1.0beta1.
@@ -23,11 +33,12 @@
 my $client = Cyrus::IMAP::Admin->new('localhost',);
 $client->authenticate(-user => 'manager', -password => 'XXXXXXX');
 
+# insert "lines" here in renamed script for setting annotations
+# example line
+#$client->mboxconfig('user/user.b at new.example.org','/vendor/kolab/folder-type','mail');
+
+# listing all annotations
 %info= $client->getinfo('user/user.a*@old.example.org');
 foreach my $attrib (sort keys %info) {
 	print $attrib.":::". $info{$attrib}."\n";
 	}
-
-#$client->mboxconfig('user/user.b at new.example.org','/vendor/kolab/folder-type','mail');
-
-# insert "lines" here and rename script to "setannotations.local.pl" or so. :)



From cvs at intevation.de  Wed Feb 22 01:36:29 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 22 Feb 2006 01:36:29 +0100 (CET)
Subject: steffen: server/kolab-webadmin/kolab-webadmin Makefile.am,1.34,1.35 
Message-ID: <20060222003629.442551005A8@lists.intevation.de>

Author: steffen

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

Modified Files:
	Makefile.am 
Log Message:
Fix for issue1100 (multidomain admin aliases)

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- Makefile.am	5 Feb 2006 20:13:55 -0000	1.34
+++ Makefile.am	22 Feb 2006 00:36:27 -0000	1.35
@@ -116,6 +116,8 @@
 	php/admin/templates/kde.tpl \
 	php/admin/templates/addrdeleted.tpl \
 	php/admin/templates/userdeleted.tpl \
+	php/admin/templates/sfdeleted.tpl \
+	php/admin/templates/distlistdeleted.tpl \
 	php/admin/templates/page.tpl \
 	php/admin/templates/addresslist.tpl \
 	php/admin/templates/sflistall.tpl \



From cvs at intevation.de  Wed Feb 22 01:36:29 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 22 Feb 2006 01:36:29 +0100 (CET)
Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include
	form.class.php, 1.23, 1.24 
Message-ID: <20060222003629.4B5851005CF@lists.intevation.de>

Author: steffen

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

Modified Files:
	form.class.php 
Log Message:
Fix for issue1100 (multidomain admin aliases)

Index: form.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/form.class.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- form.class.php	29 Aug 2005 21:28:28 -0000	1.23
+++ form.class.php	22 Feb 2006 00:36:27 -0000	1.24
@@ -151,8 +151,9 @@
 		} else {
 		  $str .= '<td><table class="contentform">';
 		  foreach( $value['options'] as $opt ) {
-			$checked = ( in_array($opt ,$value['value'] ))?"checked":"";
-			debug("Checking if $opt is in ".join(",",$value['value'])." :$checked");
+			if( is_array( $value['value'] ) ) $checked = ( in_array($opt ,$value['value'] ))?"checked":"";
+			else $checked = "";
+			//debug("Checking if $opt is in ".join(",",$value['value'])." :$checked");
 			$str .= '<tr><td><input name="'.$key.'[]" type="checkbox" value="'.MySmarty::htmlentities($opt).'" '.$value['attrs']." $checked /></td><td>"
 			  .MySmarty::htmlentities($opt).'</td></tr>';
 		  }



From cvs at intevation.de  Wed Feb 22 01:36:29 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 22 Feb 2006 01:36:29 +0100 (CET)
Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/templates
	distlistdeleted.tpl, NONE, 1.1 sfdeleted.tpl, NONE,
	1.1 service.tpl, 1.8, 1.9 
Message-ID: <20060222003629.522261006A0@lists.intevation.de>

Author: steffen

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

Modified Files:
	service.tpl 
Added Files:
	distlistdeleted.tpl sfdeleted.tpl 
Log Message:
Fix for issue1100 (multidomain admin aliases)

--- NEW FILE: distlistdeleted.tpl ---
{* Smarty Template *}
{*
  Local variables:
  buffer-file-coding-system: utf-8
  End:
*}
<h1>{$heading}</h1>

<div content="contentsimple">
<p>{tr msg="The distribution list with DN"} {$dn|escape} {tr msg="has been deleted"}</p>
<p><a href="index.php">{tr msg="Back to list of distribution lists"}</a></p>
</div>

--- NEW FILE: sfdeleted.tpl ---
{* Smarty Template *}
{*
  Local variables:
  buffer-file-coding-system: utf-8
  End:
*}
<h1>{$heading}</h1>

<div content="contentsimple">
<p>{tr msg="The shared folder with DN"} {$dn|escape} {tr msg="has been deleted"}</p>
<p><a href="index.php">{tr msg="Back to list of shared folders"}</a></p>
</div>

Index: service.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/service.tpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- service.tpl	1 Dec 2005 14:05:04 -0000	1.8
+++ service.tpl	22 Feb 2006 00:36:27 -0000	1.9
@@ -6,18 +6,20 @@
 *}
 <h1>{tr msg="Kolab Server Settings"}</h1>
 
-{if $systemaliasconf }
+{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" method="post">
-{tr msg="Email address of account that should receive administrative mail:"}
-<input type="text" name="systemaliasmail" size="80"  value="{$systemaliasmail|escape:"html"}" /><br/>
-<div align="right"><input type="submit" name="submitsystemalias" value="{tr msg="Create Distribution Lists"}" /></div>
+<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}



From cvs at intevation.de  Wed Feb 22 01:36:29 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 22 Feb 2006 01:36:29 +0100 (CET)
Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin index.php.in,
	1.1, 1.2 
Message-ID: <20060222003629.56AB01006A3@lists.intevation.de>

Author: steffen

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

Modified Files:
	index.php.in 
Log Message:
Fix for issue1100 (multidomain admin aliases)

Index: index.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/index.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- index.php.in	5 Feb 2006 20:13:55 -0000	1.1
+++ index.php.in	22 Feb 2006 00:36:27 -0000	1.2
@@ -1,6 +1,6 @@
 <?php
 /*
- *  Copyright (c) 2004 Klarälvdalens Datakonsult AB
+ *  Copyright (c) 2004-2006 Klarälvdalens Datakonsult AB
  *
  *    Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
  *
@@ -29,7 +29,7 @@
 
 function exists_group( $group ) {
   global $ldap;
-  $filter = '(&(objectClass=kolabGroupOfNames)(cn='.$ldap->escape($group).'))';
+  $filter = '(&(objectClass=kolabGroupOfNames)(mail='.$ldap->escape($group).'))';
   $res = $ldap->search( $_SESSION['base_dn'], $filter, array( 'dn' ) );
   return ( $ldap->count($res) > 0 );
 }
@@ -37,13 +37,16 @@
 /**** Check for system aliases ****/
 $maincontent = 'welcome.tpl';
 if( $auth->group() == 'admin' ) {
-  if( !exists_group( 'hostmaster' ) ||
-	  !exists_group( 'postmaster' ) ||
-	  !exists_group( 'abuse' ) ||
-	  !exists_group( 'virusalert' ) ||
-	  !exists_group( 'MAILER-DAEMON' ) ) {
-	// Ok, user did not set up system aliases
-	$maincontent = 'systemaliasnagscreen.tpl';
+  $domains = $ldap->domains();
+  foreach( $domains as $domain ) {
+	if( !exists_group( 'hostmaster@'.$domain ) ||
+		!exists_group( 'postmaster@'.$domain ) ||
+		!exists_group( 'abuse@'.$domain ) ||
+		!exists_group( 'virusalert@'.$domain ) ||
+		!exists_group( 'MAILER-DAEMON@'.$domain ) ) {
+	  // Ok, user did not set up system aliases
+	  $maincontent = 'systemaliasnagscreen.tpl';
+	}
   }
 }
 



From cvs at intevation.de  Wed Feb 22 01:36:29 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 22 Feb 2006 01:36:29 +0100 (CET)
Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist
	list.php.in, 1.1, 1.2 
Message-ID: <20060222003629.5BEF91006AD@lists.intevation.de>

Author: steffen

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

Modified Files:
	list.php.in 
Log Message:
Fix for issue1100 (multidomain admin aliases)

Index: list.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist/list.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- list.php.in	5 Feb 2006 20:13:55 -0000	1.1
+++ list.php.in	22 Feb 2006 00:36:27 -0000	1.2
@@ -295,7 +295,7 @@
 	  if ($ldap->deleteGroupOfNames($dn)) {
 		$messages[] = _('Distribution List ').$_REQUEST['cn']._(' deleted');
 		$heading = _('Entry Deleted');
-		$contenttemplate = 'sfdeleted.tpl';
+		$contenttemplate = 'distlistdeleted.tpl';
 	  } else {
 		array_push($errors, sprintf(_("LDAP Error: Could not delete %s: %s"), $dn, $ldap->error()));
 	  }



From cvs at intevation.de  Wed Feb 22 01:36:29 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 22 Feb 2006 01:36:29 +0100 (CET)
Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/service
	index.php.in, 1.1, 1.2 
Message-ID: <20060222003629.64D101006AF@lists.intevation.de>

Author: steffen

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

Modified Files:
	index.php.in 
Log Message:
Fix for issue1100 (multidomain admin aliases)

Index: index.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/service/index.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- index.php.in	5 Feb 2006 20:13:55 -0000	1.1
+++ index.php.in	22 Feb 2006 00:36:27 -0000	1.2
@@ -89,25 +89,31 @@
 
 extract_ldap_values();
 
-// Write back to LDAP
-if( $_REQUEST['submitsystemalias'] ) {
-  $mail = trim($_REQUEST['systemaliasmail']);
-  $dn = $ldap->dnForMailOrAlias( $mail );
-  if( !$dn ) {
-	$errors[] = sprintf(_("No account found for email address %s"), $mail);
-  } else {
-	foreach( array( 'postmaster', 'hostmaster', 'abuse', 'virusalert', 'MAILER-DAEMON' ) as $group ) {
-	  $attrs = array( 'objectClass' => array( 'top', 'kolabGroupOfNames' ),
-					  'cn' => $group,
-					  'mail' => $group.'@'.$postfixmydomain,
-					  'member' => $dn );
-	  if( !ldap_add( $ldap->connection, "cn=$group,".$_SESSION['base_dn'], $attrs ) ) {
-		$errors[] = sprintf(_("LDAP Error: Failed to add distribution list %s: %s"), $group, $ldap->error());
-	  } else {
-		$messages[] = sprintf( _("Successfully created distribution list %s"), $group);
+$domains = $ldap->domains();
+$domain_count = 0;
+foreach( $domains as $domain ) {
+  // Write back to LDAP
+  if( $_REQUEST['submitsystemalias_'.$domain_count] ) {
+	$mail = trim($_REQUEST['systemaliasmail_'.$domain_count]);
+	$dn = $ldap->dnForMailOrAlias( $mail );
+	if( !$dn ) {
+	  $errors[] = sprintf(_("No account found for email address %s"), $mail);
+	} else {
+	  foreach( array( 'postmaster', 'hostmaster', 'abuse', 'virusalert', 'MAILER-DAEMON' ) as $group ) {
+		$gadr = $group.'@'.$domain;
+		$attrs = array( 'objectClass' => array( 'top', 'kolabGroupOfNames' ),
+						'cn' => $gadr,
+						'mail' => $gadr,
+						'member' => $dn );
+		if( !ldap_add( $ldap->connection, "cn=$gadr,".$_SESSION['base_dn'], $attrs ) ) {
+		  $errors[] = sprintf(_("LDAP Error: Failed to add distribution list %s: %s"), $gadr, $ldap->error());
+		} else {
+		  $messages[] = sprintf( _("Successfully created distribution list %s"), $gadr);
+		}
 	  }
 	}
   }
+  $domain_count++;
 }
 
 if( $_REQUEST['submitservices'] ) {
@@ -282,7 +288,7 @@
 /**** Check for system aliases ****/
 function exists_group( $group ) {
   global $ldap;
-  $filter = '(&(objectClass=kolabGroupOfNames)(cn='.$ldap->escape($group).'))';
+  $filter = '(&(objectClass=kolabGroupOfNames)(mail='.$ldap->escape($group).'))';
   $res = $ldap->search( $_SESSION['base_dn'], $filter, array( 'dn' ) );
   return ( $ldap->count($res) > 0 );
 }
@@ -312,18 +318,24 @@
 								  $menuitems[$sidx])?$menuitems[$sidx]['submenu']:array() );
 $smarty->assign( 'maincontent', 'service.tpl' );
 
-$smarty->assign( 'systemaliasconf', false );
+$systemaliasconf = array();
+
 if( $auth->group() == 'admin' ) {
-  if( !exists_group( 'hostmaster' ) ||
-	  !exists_group( 'postmaster' ) ||
-	  !exists_group( 'abuse' ) ||
-	  !exists_group( 'virusalert' ) ||
-	  !exists_group( 'MAILER-DAEMON' ) ) {
-	// Ok, user did not set up system aliases
-	$smarty->assign( 'systemaliasconf', true );
+  $domain_count = 0;
+  foreach( $ldap->domains() as $domain ) {
+	if( !exists_group( 'hostmaster@'.$domain ) ||
+		!exists_group( 'postmaster@'.$domain ) ||
+		!exists_group( 'abuse@'.$domain ) ||
+		!exists_group( 'virusalert@'.$domain ) ||
+		!exists_group( 'MAILER-DAEMON@'.$domain ) ) {
+	  // Ok, user did not set up system aliases
+	  $systemaliasconf[] = array( 'n'=>$domain_count, 'domain'=>$domain );
+	}
+	$domain_count++;
   }
 }
 
+$smarty->assign( 'systemaliasconf', $systemaliasconf );
 $smarty->display('page.tpl');
 
 /*



From cvs at intevation.de  Wed Feb 22 12:02:22 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 22 Feb 2006 12:02:22 +0100 (CET)
Subject: thomas: utils/testing create-annotated-destroy.py,NONE,1.1 
Message-ID: <20060222110222.3BE891006AB@lists.intevation.de>

Author: thomas

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

Added Files:
	create-annotated-destroy.py 
Log Message:
Added create-annotated-destroy.py (stress test for IMAP annotations.de)


--- NEW FILE: create-annotated-destroy.py ---
# -------------------------------------------------------------------
# Copyright (C) 2006 by Intevation GmbH
# Author(s):
# Sascha Wilde <wilde at intevation.de>

# This program is free software under the GNU GPL (>=v2)
# Read the file COPYING coming with the software for details.
# -------------------------------------------------------------------
# Try to make some imap traffic which forces annotations.db to break.

# Usage: create-annotated-destroy.py USER MAILLEN
#
#   Traffic is generated as USER (with passwd USER)
#   Mails are generated with a maximum length of MAILLEN KiB

# imaplib version needs to be at least 2.58, get it from:
# http://svn.python.org/projects/python/trunk/Lib/imaplib.py
import imaplib
import sys
from random import *

import time

seed()

# XXX set imap host and mail domain:
domain = "example.com"
host = "kolab.%s" % domain

def mailgen(len):
    n = randint(1,1000000)
    mail = "From: Badboy at test.invalid\nTo: %s@%s\nSubject: BAD!\n\n" % (user,
                                                                        domain)
    for i in range(len):
        n = n ^ (n << 1) ^ i
        if i % 79 == 0:
            mail = mail + "\n"
        else:
            mail = mail + chr(long(n) % 74 + 48)
    return mail


# imaplib.Debug=1

m=imaplib.IMAP4(host)

if len(sys.argv) >= 2:
    user = sys.argv[1]
else:
    user = "test1"

if len(sys.argv) >= 3:
    maillen = int(sys.argv[2]) * 1024
else:
    maillen = 102400

m.login("%s@%s" % (user, domain), user)

# Ok, now lets boogie...

print "Writing one big mail..."
m.append("INBOX", None, None, mailgen(200000))

while True:
    n = randint(1,260)

    print "Creating and annotating %i Mailboxes..." % n

    for i in range(n):
        box = "INBOX/badbox%i" % i
        print i,
        m.create(box)
        print ".",
        m.setannotation(box,"/vendor/kolab/death",
                        '("value.shared" "die server die")')
        print ".",
        m.setannotation(box,"/vendor/kolab/murder",
                        '("value.shared" "Die die die!!!")')
        print ".",
        m.setannotation(box,"/vendor/kolab/kill",
                        '("value.shared" "Annotations must die!")')

    if randint(0,2) == 0:
        print "...writing Mail (%i bytes)..." % maillen,

        mail = mailgen(maillen)

        for i in range(n):
            print ".",
            m.append("INBOX/badbox%i" % (n-1), None, None, mail)

        print "done!"
        time.sleep(1)
        print "Reading mail..."
        m.select("INBOX")
        m.check()
        m.fetch("1", "(UID BODY[TEXT])")
        m.select("INBOX/badbox%i" % (n-1))
        m.check()
        m.fetch("1:*", "(UID BODY[TEXT])")
        print "starting a search..."
        m.uid("SEARCH",None,'(FROM "Toltec Synchronization")')

    print
    print "Reading annotations..."
    for i in range(n):
        box = "INBOX/badbox%i" % i
        print i,
        m.getannotation(box,"/vendor/kolab/*",'"value.shared"')

    print
    print "Deleting mailboxes again ..."
    for i in range(n):
        box = "INBOX/badbox%i" % i
        print i,
        m.delete(box)
        
    print
    print "------------------------------------------------------------"

    if randint(0,5) == 4:
        m.shutdown()
        print "Time for a fresh connection!"
        time.sleep(2)
        m=imaplib.IMAP4(host)
        m.login("%s@%s" % (user, domain), user)






From cvs at intevation.de  Wed Feb 22 22:28:44 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 22 Feb 2006 22:28:44 +0100 (CET)
Subject: steffen: server/perl-kolab/Kolab-Conf Conf.pm.in,1.4,1.5 
Message-ID: <20060222212844.AE09D1006A0@lists.intevation.de>

Author: steffen

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

Modified Files:
	Conf.pm.in 
Log Message:
Fix for issue1092 (performance issue creating virtual etc. tables)

Index: Conf.pm.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Conf.pm.in	15 Jan 2006 13:59:05 -0000	1.4
+++ Conf.pm.in	22 Feb 2006 21:28:42 -0000	1.5
@@ -381,8 +381,8 @@
     );
 
     my $mesg = $ldap->search(
-        base    => $Kolab::config{'base_dn'},
-        scope   => 'sub',
+        base    => 'k=kolab,'.$Kolab::config{'base_dn'},
+        scope   => 'base',
         filter  => '(objectclass=*)'
     );
     if ($mesg->code) {
@@ -552,7 +552,7 @@
             foreach (@$userlist) {
 	      my $uid = $_;
 	      my $umesg = $ldap->search( base => $uid,
-					 scope => 'exact', 
+					 scope => 'base', 
 					 filter => '(objectClass=*)' );
 	      if ( $umesg && $umesg->code() <= 0 && $umesg->count() == 1 ) {
 		my $mail;



From cvs at intevation.de  Thu Feb 23 17:40:20 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu, 23 Feb 2006 17:40:20 +0100 (CET)
Subject: bernhard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES
	messages.po, 1.15, 1.16 
Message-ID: <20060223164020.A40E81005D4@lists.intevation.de>

Author: bernhard

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

Modified Files:
	messages.po 
Log Message:
Tyop STMP fixed.


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES/messages.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- messages.po	12 Dec 2005 00:37:05 -0000	1.15
+++ messages.po	23 Feb 2006 16:40:18 -0000	1.16
@@ -750,7 +750,7 @@
 "enabled if you want to use the Kolab server to receive mail from other "
 "internet domains."
 msgstr ""
-"Nachrichten aus anderen Domänen über nicht-authentifiziertes STMP "
+"Nachrichten aus anderen Domänen über nicht-authentifiziertes SMTP "
 "akzeptieren. Dies muß eingeschaltet werden, wenn der Kolab-Server "
 "Nachrichten aus anderen Internet-Domänen empfangen können soll."
 



From cvs at intevation.de  Thu Feb 23 17:47:52 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu, 23 Feb 2006 17:47:52 +0100 (CET)
Subject: bernhard: server/kolab-webadmin/kolab-webadmin/php/admin/templates
	service.tpl, 1.9, 1.10 
Message-ID: <20060223164752.782941006D8@lists.intevation.de>

Author: bernhard

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

Modified Files:
	service.tpl 
Log Message:
Better explanation for Accept Internet Mail:
	- Added hint that this can be left disabled when using a gateway.


Index: service.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/service.tpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- service.tpl	22 Feb 2006 00:36:27 -0000	1.9
+++ service.tpl	23 Feb 2006 16:47:50 -0000	1.10
@@ -99,7 +99,7 @@
 <div class="contentform">
 <form name="postfixallowunauthform" method="post">
 <input type="checkbox" name="postfixallowunauth" {if $postfixallowunauth == 'true' }checked{/if} />
-{tr msg="Accept mail from other domains over non-authenticated SMTP. This must be enabled if you want to use the Kolab server to receive mail from other internet domains."}
+{tr msg="Accept mail from other domains over non-authenticated SMTP. This must be enabled if you want to use the Kolab Server to receive mail from other internet domains directly. Leave disabled to accept mail only from SMTP gateways that are within the priviledged network."}
 <div align="right"><input type="submit" name="submitpostfixallowunauth" value="{tr msg="Update"}" /></div>
 </form>
 </div>



From cvs at intevation.de  Tue Feb 28 15:39:09 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 28 Feb 2006 15:39:09 +0100 (CET)
Subject: steffen: server/perl-kolab/Kolab-LDAP LDAP.pm.in,1.1,1.2 
Message-ID: <20060228143909.9F2D21005A3@lists.intevation.de>

Author: steffen

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

Modified Files:
	LDAP.pm.in 
Log Message:
fix for warning in issue1068

Index: LDAP.pm.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP/LDAP.pm.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- LDAP.pm.in	17 Dec 2005 21:45:32 -0000	1.1
+++ LDAP.pm.in	28 Feb 2006 14:39:07 -0000	1.2
@@ -319,7 +319,7 @@
 	      # Deal with group and resource accounts
 	      my $edn = Net::LDAP::Util::ldap_explode_dn($object->dn(), casefold=>'lower' );
 	      my $gcn = $edn->[1]->{'cn'};
-	      if( $gcn eq 'groups' || $gcn eq 'resources' ) {
+	      if( $gcn && ($gcn eq 'groups' || $gcn eq 'resources') ) {
 		# We need to give the calendar user access to 
 		# the groups/resources folder.
 		# TODO: Don't hardcode username



From cvs at intevation.de  Tue Feb 28 22:20:40 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 28 Feb 2006 22:20:40 +0100 (CET)
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr
	kolabmailboxfilter.php.in, 1.5, 1.6 kolabmailtransport.php, 1.6, 1.7 
Message-ID: <20060228212040.5AD761005D3@lists.intevation.de>

Author: steffen

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

Modified Files:
	kolabmailboxfilter.php.in kolabmailtransport.php 
Log Message:
Fix for Issue1042 (thanks bh!)

Index: kolabmailboxfilter.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabmailboxfilter.php.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kolabmailboxfilter.php.in	21 Feb 2006 10:26:01 -0000	1.5
+++ kolabmailboxfilter.php.in	28 Feb 2006 21:20:38 -0000	1.6
@@ -77,7 +77,7 @@
 $add_headers = array();
 $headers_done = false;
 $from = false;
-while (!feof(STDIN)) {
+while (!feof(STDIN) && !$headers_done) {
   $buffer = fgets(STDIN, 8192);
   $line = rtrim( $buffer, "\r\n");
   if( $line == '' ) {
@@ -91,6 +91,12 @@
     myLog("Found iCal data in message", RM_LOG_DEBUG);    
     $ical = true;
   }
+  if( fwrite($tmpf, $buffer) === false ) {
+    exit(EX_TEMPFAIL);
+  }
+}
+while (!feof(STDIN)) {
+  $buffer = fread( STDIN, 8192 );
   if( fwrite($tmpf, $buffer) === false ) {
     exit(EX_TEMPFAIL);
   }

Index: kolabmailtransport.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabmailtransport.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- kolabmailtransport.php	21 Feb 2006 10:26:01 -0000	1.6
+++ kolabmailtransport.php	28 Feb 2006 21:20:38 -0000	1.7
@@ -106,7 +106,8 @@
      */
     if( $this->got_newline && $data[0] == '.' ) $data = '.'.$data;
     $data = str_replace("\n.", "\n..", $data);
-    if( $data[count($data)] == "\n" ) $this->got_newline = true;
+    $len = strlen($data);
+    if( $len>0 && $data[$len-1] == "\n" ) $this->got_newline = true;
     else $this->got_newline = false;
   }
 



From cvs at intevation.de  Wed Mar  1 20:20:30 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed,  1 Mar 2006 20:20:30 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf kolabsrv.in,1.4,1.5 
Message-ID: <20060301192030.13C421005C9@lists.intevation.de>

Author: richard

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

Modified Files:
	kolabsrv.in 
Log Message:
typo

Index: kolabsrv.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolabsrv.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kolabsrv.in	31 Jan 2006 22:00:16 -0000	1.4
+++ kolabsrv.in	1 Mar 2006 19:20:27 -0000	1.5
@@ -39,7 +39,7 @@
 
 if [[ "$2" == "all" ]]; then
 	SERVICES="@LDAPD@ saslauthd spamd amavis apache2 freshclam clamd cyrus postfix"
-	# SERVICES="$SERVICES kolab"
+	# SERVICES="$SERVICES kolabd"
 else
 	SERVICES=$2
 fi



From cvs at intevation.de  Thu Mar  2 13:51:15 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu,  2 Mar 2006 13:51:15 +0100 (CET)
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
	freebusy.class.php.in, 1.2, 1.3 freebusycache.class.php.in, 1.2, 1.3 
Message-ID: <20060302125115.266681006A4@lists.intevation.de>

Author: steffen

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

Modified Files:
	freebusy.class.php.in freebusycache.class.php.in 
Log Message:
Make freebusy work again -- the dbtype param broke it

Index: freebusy.class.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.class.php.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- freebusy.class.php.in	5 Feb 2006 20:15:10 -0000	1.2
+++ freebusy.class.php.in	2 Mar 2006 12:51:12 -0000	1.3
@@ -139,13 +139,13 @@
     }
 	myLog("Reading messagelist", RM_LOG_DEBUG);
 	$getMessages_start = microtime_float();
-	$msglist = &$this->imap->getMessagesList();
+	$msglist = $this->imap->getMessagesList();
 	//$msglist = &$this->imap->getMessages();
 	myLog("FreeBusy::imap->getMessagesList() took ".(microtime_float()-$getMessages_start)." secs.", RM_LOG_DEBUG);
     if( PEAR::isError( $msglist ) ) return array( $msglist, null);
 	foreach ($msglist as $msginfo) {
 	  //myLog("Reading message ".$msginfo['msg_id'], RM_LOG_DEBUG);
-	  $textmsg = &$this->imap->getMsg($msginfo['msg_id']);
+	  $textmsg = $this->imap->getMsg($msginfo['msg_id']);
       $mimemsg = &MIME_Structure::parseTextMIMEMessage($textmsg);
     
       // Read in a Kolab event object, if one exists
@@ -243,7 +243,8 @@
     $vCal->addComponent($this->clearExtra($vFb));
   
     // Generate the vCal file.
-    return array( $vCal->exportvCalendar(), $xvCal->exportvCalendar() );
+    $result = array( $vCal->exportvCalendar(), $xvCal->exportvCalendar() );
+    return $result;
   }
 
   /********************** Private API below this line ********************/

Index: freebusycache.class.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusycache.class.php.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- freebusycache.class.php.in	5 Feb 2006 20:15:10 -0000	1.2
+++ freebusycache.class.php.in	2 Mar 2006 12:51:12 -0000	1.3
@@ -45,7 +45,11 @@
       // false data means delete the pfb
       unlink($fbfilename);
       $oldacl = $this->loadACL( $filename );
-      $db = dba_open( $this->basedir.'/pfbcache.db', 'cd', $params['dbtype'] );
+      if( isset($params['dbtype']) ) {
+	$db = dba_open( $this->basedir.'/pfbcache.db', 'cd', $params['dbtype'] );
+      } else {
+	$db = dba_open( $this->basedir.'/pfbcache.db', 'cd' );
+      }
       if( $db === false ) return false;
       foreach( $oldacl as $ac ) {
 	  if( dba_exists( $ac['USER'], $db ) ) {
@@ -92,7 +96,11 @@
       default: $perm = 'a';
       }
 
-      $db = dba_open( $this->basedir.'/pfbcache.db', 'cd', $params['dbtype'] );
+      if( isset($params['dbtype']) ) {
+	$db = dba_open( $this->basedir.'/pfbcache.db', 'cd', $params['dbtype'] );
+      } else {
+	$db = dba_open( $this->basedir.'/pfbcache.db', 'cd' );
+      }
       if( $db === false ) {
 	myLog('Unable to open freebusy cache db '.$this->basedir.'/pfbcache.db',
 	      RM_LOG_ERROR );
@@ -145,7 +153,11 @@
     $fbfilename = $this->mkfbfilename($filename);
     unlink($fbfilename);
     unlink($this->mkaclfilename($filename));    
-    $db = dba_open( $this->basedir.'/pfbcache.db', 'cd', $params['dbtype'] );
+    if( isset($params['dbtype']) ) {
+      $db = dba_open( $this->basedir.'/pfbcache.db', 'cd', $params['dbtype'] );
+    } else {
+      $db = dba_open( $this->basedir.'/pfbcache.db', 'cd' );
+    }
     if( $db === false ) return false;
     for( $uid = dba_firstkey($db); $uid !== false; $uid = dba_nextkey($db)) {
       $lst = dba_fetch( $uid, $db );
@@ -160,7 +172,11 @@
   function findAll( $uid, $groups ) {
     global $params;
     $lst = array();
-    $db = dba_open( $this->basedir.'/pfbcache.db', 'rd', $params['dbtype'] );
+    if( isset($params['dbtype']) ) {
+      $db = dba_open( $this->basedir.'/pfbcache.db', 'rd', $params['dbtype'] );
+    } else {
+      $db = dba_open( $this->basedir.'/pfbcache.db', 'rd' );
+    }
     if( $db === false ) return false;
     $uids = $groups;
     for( $i = 0; $i < count($uids); $i++ ) $uids[$i] = 'group:'.$uids[$i];



From cvs at intevation.de  Thu Mar  2 21:40:40 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu,  2 Mar 2006 21:40:40 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog, 1.63, 1.64 kolab_bootstrap.in,
	1.20, 1.21 kolab_sslcert.sh.in, 1.2, 1.3 
Message-ID: <20060302204040.139ED1006D3@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog kolab_bootstrap.in kolab_sslcert.sh.in 
Log Message:
introduced a new variable pki_grp for public key infrastructure (pki) support



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- ChangeLog	7 Feb 2006 11:41:07 -0000	1.63
+++ ChangeLog	2 Mar 2006 20:40:37 -0000	1.64
@@ -1,5 +1,10 @@
-2006-02-07  Thomas Arendsen Hein  <thomas at intevation.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
+	  variable pki_grp for public key infrastructure (pki) group support.
 
+2006-02-07  Thomas Arendsen Hein  <thomas at intevation.de>
 	* dist_conf/kolab: Use amavisd.log instead of amavis.log as log file
 	  to fix logrotate in OpenPKG installation (Issue1015).
 

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- kolab_bootstrap.in	17 Jan 2006 19:49:18 -0000	1.20
+++ kolab_bootstrap.in	2 Mar 2006 20:40:37 -0000	1.21
@@ -699,9 +699,9 @@
     kolab_system("@sysconfdir@/kolab/kolab_ca.sh -newkey $fqdn @sysconfdir@/kolab/key.pem");
     kolab_system("@sysconfdir@/kolab/kolab_ca.sh -newreq $fqdn @sysconfdir@/kolab/key.pem @sysconfdir@/kolab/newreq.pem ");
     kolab_system("@sysconfdir@/kolab/kolab_ca.sh -sign @sysconfdir@/kolab/newreq.pem @sysconfdir@/kolab/cert.pem");
-    kolab_system("chgrp @ldapserver_rgrp@ @sysconfdir@/kolab/key.pem;");
+    kolab_system("chgrp @pki_grp@ @sysconfdir@/kolab/key.pem;");
     kolab_system("chmod 0640 @sysconfdir@/kolab/key.pem;");
-    kolab_system("chgrp @ldapserver_rgrp@ @sysconfdir@/kolab/cert.pem;");
+    kolab_system("chgrp @pki_grp@ @sysconfdir@/kolab/cert.pem;");
     kolab_system("chmod 0640 @sysconfdir@/kolab/cert.pem;");
     print <<'EOS';
 ################################################################################

Index: kolab_sslcert.sh.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_sslcert.sh.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolab_sslcert.sh.in	14 Jan 2006 22:45:54 -0000	1.2
+++ kolab_sslcert.sh.in	2 Mar 2006 20:40:37 -0000	1.3
@@ -35,9 +35,9 @@
 		                   -config tmp.req.cnf >/dev/null 2>&1
 echo "done"
 
-chgrp @kolab_rgrp@ key.pem
+chgrp @pki_grp@ key.pem
 chmod 0640 key.pem
-chgrp @kolab_rgrp@ cert.pem
+chgrp @pki_grp@ cert.pem
 chmod 0640 cert.pem
 
 #rm -f tmp.req.cnf



From cvs at intevation.de  Thu Mar  2 21:40:40 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu,  2 Mar 2006 21:40:40 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf common, 1.22, 1.23 kolab, 1.28,
	1.29 suse, 1.37, 1.38 
Message-ID: <20060302204040.1707E1006D5@lists.intevation.de>

Author: richard

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

Modified Files:
	common kolab suse 
Log Message:
introduced a new variable pki_grp for public key infrastructure (pki) support



Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- common	5 Feb 2006 17:51:31 -0000	1.22
+++ common	2 Mar 2006 20:40:38 -0000	1.23
@@ -110,6 +110,7 @@
 	-e 's,[@]ldapserver_usr[@],$(ldapserver_usr),g' \
 	-e 's,[@]perl_kolab_rpm[@],$(perl_kolab_rpm),g' \
 	-e 's,[@]pkgdocdir[@],$(pkgdocdir),g' \
+	-e 's,[@]pki_grp[@],$(pki_grp),g' \
 	-e 's,[@]resmgr_confdir[@],$(resmgr_confdir),g' \
 	-e 's,[@]resmgr_conffile_grp[@],$(resmgr_conffile_grp),g' \
 	-e 's,[@]resmgr_conffile_usr[@],$(resmgr_conffile_usr),g' \

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- kolab	7 Feb 2006 11:41:07 -0000	1.28
+++ kolab	2 Mar 2006 20:40:38 -0000	1.29
@@ -183,3 +183,5 @@
 graveyard_tscache=${localstatedir}/kolab/graveyard_tscache.db
 
 backupdir=${sysconfdir}/kolab
+
+pki_grp=${kolab_rgrp}

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- suse	5 Feb 2006 20:57:28 -0000	1.37
+++ suse	2 Mar 2006 20:40:38 -0000	1.38
@@ -160,6 +160,8 @@
 
 backupdir=${localstatedir}/adm/backup/kolab
 
+pki_grp=pki
+
 # One time backup files.  These original distribution configuration files
 # will be backed up once, just before kolab is about to change those files.
 backupfiles=/etc/amavisd.conf \



From cvs at intevation.de  Thu Mar  2 21:41:15 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu,  2 Mar 2006 21:41:15 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf kolabsrv.in,1.5,1.6 
Message-ID: <20060302204115.CA7351006D3@lists.intevation.de>

Author: richard

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

Modified Files:
	kolabsrv.in 
Log Message:
activate the kolabd service

Index: kolabsrv.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolabsrv.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kolabsrv.in	1 Mar 2006 19:20:27 -0000	1.5
+++ kolabsrv.in	2 Mar 2006 20:41:13 -0000	1.6
@@ -39,7 +39,7 @@
 
 if [[ "$2" == "all" ]]; then
 	SERVICES="@LDAPD@ saslauthd spamd amavis apache2 freshclam clamd cyrus postfix"
-	# SERVICES="$SERVICES kolabd"
+	SERVICES="$SERVICES kolabd"
 else
 	SERVICES=$2
 fi



From cvs at intevation.de  Sun Mar  5 21:25:00 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun,  5 Mar 2006 21:25:00 +0100 (CET)
Subject: martin: doc/logo kolab_logo.readme,NONE,1.1 
Message-ID: <20060305202500.DD3EA1005D4@lists.intevation.de>

Author: martin

Update of /kolabrepository/doc/logo
In directory doto:/tmp/cvs-serv3958

Added Files:
	kolab_logo.readme 
Log Message:
Martin Konold: defined CYMK values and started defining terms of use


--- NEW FILE: kolab_logo.readme ---

The CYMK value of the Kolab logo is:

C=100%
M=90%
Y=5%
K=1%

The logo may be used under the terms of fair use.



From cvs at intevation.de  Tue Mar  7 12:39:25 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue,  7 Mar 2006 12:39:25 +0100 (CET)
Subject: bernhard: server/kolab-webadmin/kolab-webadmin ChangeLog,1.20,1.21 
Message-ID: <20060307113925.B9FDC1005D5@lists.intevation.de>

Author: bernhard

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

Modified Files:
	ChangeLog 
Log Message:
Renamed Deletages to Email-Delegates 
in $entries['kolabdelegate'] and checkdelegate(). 
Also improved the formating and the comment.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- ChangeLog	5 Feb 2006 20:13:55 -0000	1.20
+++ ChangeLog	7 Mar 2006 11:39:23 -0000	1.21
@@ -1,3 +1,8 @@
+2006-03-07 Bernhard Reiter <bernhard at intevation.de>
+	* www/admin/user/index.php.in: Renamed Deletages to Email-Delegates
+	in $entries['kolabdelegate'] and checkdelegate(). Also improved
+	the formating and the comment.
+
 2006-02-05 Richard Bos <richard at radoeka.nl>
 	* www/admin/addressbook/addr.php, www/admin/addressbook/index.php,
 	  www/admin/administrator/admin.php, www/admin/administrator/index.php,



From cvs at intevation.de  Tue Mar  7 12:39:25 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue,  7 Mar 2006 12:39:25 +0100 (CET)
Subject: bernhard: server/kolab-webadmin/kolab-webadmin/www/admin/user
	user.php.in, 1.4, 1.5 
Message-ID: <20060307113925.BC9511006AA@lists.intevation.de>

Author: bernhard

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

Modified Files:
	user.php.in 
Log Message:
Renamed Deletages to Email-Delegates 
in $entries['kolabdelegate'] and checkdelegate(). 
Also improved the formating and the comment.


Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- user.php.in	20 Feb 2006 22:20:59 -0000	1.4
+++ user.php.in	7 Mar 2006 11:39:23 -0000	1.5
@@ -124,7 +124,7 @@
   $str = '';
   foreach( $lst as $delegate ) {
 	if( $ldap->count( $ldap->search( $_SESSION['base_dn'], '(mail='.$ldap->escape($delegate).')' ) ) == 0 ) {
-	  return sprintf(_("Delegate %s does not exist"), $delegate);
+	  return sprintf(_("Email-Delegate %s does not exist"), $delegate);
 	} 
   }
   return '';
@@ -411,10 +411,11 @@
 						   'type' => 'textarea',
 						   'validation' => 'checkuniquealias',
 						   'comment' => _('One address per line') );
-$entries['kolabdelegate'] =array( 'name' => _('Delegates'),
-							 'type' => 'textarea',
-							 'validation' => 'checkdelegate',
-							 'comment' => _('One Email address per line') );
+$entries['kolabdelegate'] =array( 'name' => _('Email-Delegates'),
+		'type' => 'textarea',
+		'validation' => 'checkdelegate',
+		'comment' => _('Others allowed to send emails with a "from" address(es) of this account.') . '<br/>' .
+			_('One email address per line.') );
 $entries['o_0'] = array( 'name' => _('Organisation') );
 $entries['ou_0'] = array( 'name' => _('Organisational Unit') );
 $entries['roomNumber_0'] = array( 'name' => _('Room Number') );



From cvs at intevation.de  Tue Mar  7 12:47:47 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue,  7 Mar 2006 12:47:47 +0100 (CET)
Subject: bernhard: server/kolab-webadmin/kolab-webadmin/www/admin/user
	user.php.in, 1.5, 1.6 
Message-ID: <20060307114747.27FF21006A8@lists.intevation.de>

Author: bernhard

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

Modified Files:
	user.php.in 
Log Message:
Typo.


Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- user.php.in	7 Mar 2006 11:39:23 -0000	1.5
+++ user.php.in	7 Mar 2006 11:47:45 -0000	1.6
@@ -414,7 +414,7 @@
 $entries['kolabdelegate'] =array( 'name' => _('Email-Delegates'),
 		'type' => 'textarea',
 		'validation' => 'checkdelegate',
-		'comment' => _('Others allowed to send emails with a "from" address(es) of this account.') . '<br/>' .
+		'comment' => _('Others allowed to send emails with a "from" address of this account.') . '<br/>' .
 			_('One email address per line.') );
 $entries['o_0'] = array( 'name' => _('Organisation') );
 $entries['ou_0'] = array( 'name' => _('Organisational Unit') );



From cvs at intevation.de  Wed Mar  8 17:13:19 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed,  8 Mar 2006 17:13:19 +0100 (CET)
Subject: bernhard: doc/proko2-doc doc3.sxw,1.33,1.34 
Message-ID: <20060308161319.A55381005C7@lists.intevation.de>

Author: bernhard

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

Modified Files:
	doc3.sxw 
Log Message:
Corrected a bug in section 6 working with groups:
It is important to make a POP account and then map a new pst.
Before it said IMAP and did not mention the new pst.


Index: doc3.sxw
===================================================================
RCS file: /kolabrepository/doc/proko2-doc/doc3.sxw,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
Binary files /tmp/cvsJebLpW and /tmp/cvs6UIRgJ differ



From cvs at intevation.de  Wed Mar  8 17:19:33 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed,  8 Mar 2006 17:19:33 +0100 (CET)
Subject: bernhard: doc/www/src documentation.html.m4,1.25,1.26 
Message-ID: <20060308161933.F3F5D1005C7@lists.intevation.de>

Author: bernhard

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

Modified Files:
	documentation.html.m4 
Log Message:
New Doc3 Rev 1.34.


Index: documentation.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/documentation.html.m4,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- documentation.html.m4	17 Jan 2006 18:32:30 -0000	1.25
+++ documentation.html.m4	8 Mar 2006 16:19:31 -0000	1.26
@@ -20,8 +20,8 @@
        >CVS HEAD as sxw</a>
 
  <p>
- <li>Outlook2003 with Toltec2 Setup (aka Doc3, pdf: 0.9MB, sxw: 0.5MB):<br>
-     <a href="./doc/doc3-1.33.pdf">Doc3, Version 1.33 as pdf</a>
+ <li>Outlook2003 with Toltec2 Setup (aka Doc3, pdf: 1,5MB, sxw: 0.5MB):<br>
+     <a href="./doc/doc3-1.34.pdf">Doc3, Version 1.34 as pdf</a>
     |
      <a href="http://kolab.org/cgi-bin/viewcvs-kolab.cgi/doc/proko2-doc/doc3.sxw"
        >CVS HEAD as sxw</a>



From cvs at intevation.de  Wed Mar  8 21:18:42 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed,  8 Mar 2006 21:18:42 +0100 (CET)
Subject: steffen: server Makefile,1.8,1.9 obmtool.conf,1.218,1.219 
Message-ID: <20060308201842.763D210016A@lists.intevation.de>

Author: steffen

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

Modified Files:
	Makefile obmtool.conf 
Log Message:
Applied patch for issue1042 from bh and updated versions

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile	11 Jan 2006 22:45:22 -0000	1.8
+++ Makefile	8 Mar 2006 20:18:40 -0000	1.9
@@ -16,4 +16,3 @@
 	cd kolab-webadmin && make dist
 	cd stage && wget -c `/kolab/bin/openpkg register -R ftp://ftp.openpkg.org/current/SRC/clamav-0.88-20060110.src.rpm`
 	cd stage && cp ../obmtool ../obmtool.conf ../README.1st . && echo "Remember to update obmtool.conf!"
-

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -d -r1.218 -r1.219
--- obmtool.conf	3 Feb 2006 14:53:56 -0000	1.218
+++ obmtool.conf	8 Mar 2006 20:18:40 -0000	1.219
@@ -4,7 +4,7 @@
 ##  Package listing for Kolab
 ##
 ##  based on Ralf S. Engelschall's "obmtool.conf -- Development Tool Configuration"
-##  Copyright (c) 2004-2005 Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
+##  Copyright (c) 2004-2006 Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
 ##  Copyright (c) 2003 Thomas Lotterer <thomas at lotterer.net>
 ##
 
@@ -24,7 +24,7 @@
 
 %kolab
     echo "---- boot/build ${NODE} %${CMD} ----"
-    kolab_version="2.1beta1";
+    kolab_version="2.1-snapshot-20060308";
     PREFIX=/${CMD};
     loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
     plusloc='+'
@@ -48,7 +48,11 @@
         --muid="19414" --ruid="19415" --nuid="19416" \
         --mgid="19414" --rgid="19415" --ngid="19416"
 
-    @install ${loc}openpkg-registry-0.2.5-20051129
+    @install ${loc}openpkg-registry-0.2.7-20060223
+    if test -n "$USERNAME" ; then
+      $PREFIX/bin/openpkg register --mode=post --user=$USERNAME
+      $PREFIX/bin/openpkg register --printstatus && echo "Please associate the instance now. Then RETURN to continue." && read DUMMY
+    fi
     @install ${loc}make-3.80-2.5.0
     @install ${loc}binutils-2.16.1-2.5.0
     @install ${loc}gcc-4.0.2-2.5.0
@@ -137,7 +141,7 @@
 	--with=dom \
 	--with=ssl \
 	--with=mbstring
-    @install ${altloc}php-smarty-2.6.3-20040702
+    @install ${altloc}php-smarty-2.6.10-20051003
     @install ${loc}gmp-4.1.4-2.5.0
     @install ${loc}spamassassin-3.1.0-2.5.0
     @install ${plusloc}amavisd-2.3.3-2.5.0
@@ -145,11 +149,11 @@
     @install ${altloc}clamav-0.88-20060110
 #    @install ${loc}vim-6.3.78-2.4.0
 #    @install ${plusloc}dcron-2.9-2.4.0
-    @install ${altloc}perl-kolab-5.8.7-20060201
-    @install ${altloc}kolabd-2.0.99-20060203 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-webadmin-2.0.99-20060201 --define kolab_version=$kolab_version
-	@install ${altloc}kolab-horde-framework-2.0.99-20051220 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-resource-handlers-2.0.99-20060201 --define kolab_version=$kolab_version
+    @install ${altloc}perl-kolab-5.8.7-20060228
+    @install ${altloc}kolabd-2.0.99-20060228 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-webadmin-2.0.99-20060228 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-horde-framework-2.0.99-20051220 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-resource-handlers-2.0.99-20060308 --define kolab_version=$kolab_version
     @install ${altloc}kolab-horde-fbview-2.0.99-20051220 --define kolab_version=$kolab_version
     @check
 



From cvs at intevation.de  Wed Mar  8 21:18:42 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed,  8 Mar 2006 21:18:42 +0100 (CET)
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr
	kolabmailtransport.php, 1.7, 1.8 
Message-ID: <20060308201842.7E70C1005C7@lists.intevation.de>

Author: steffen

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

Modified Files:
	kolabmailtransport.php 
Log Message:
Applied patch for issue1042 from bh and updated versions

Index: kolabmailtransport.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabmailtransport.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- kolabmailtransport.php	28 Feb 2006 21:20:38 -0000	1.7
+++ kolabmailtransport.php	8 Mar 2006 20:18:40 -0000	1.8
@@ -120,7 +120,12 @@
   }
 
   function end() {
-    if (PEAR::isError($this->transport->_send("\r\n.\r\n"))) {
+    if ($this->got_newline) 
+    	$dot = ".\r\n";
+    else
+    	$dot = "\r\n.\r\n";
+
+    if (PEAR::isError($this->transport->_send($dot))) {
       return new PEAR_Error('write to socket failed');
     }
     if (PEAR::isError($error = $this->transport->_parseResponse(250))) {



From cvs at intevation.de  Wed Mar  8 21:19:44 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed,  8 Mar 2006 21:19:44 +0100 (CET)
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr
	kolabmailtransport.php, 1.3.2.3, 1.3.2.4 
Message-ID: <20060308201944.D921510016A@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	kolabmailtransport.php 
Log Message:
Applied patch for issue1042 from bh

Index: kolabmailtransport.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabmailtransport.php,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -d -r1.3.2.3 -r1.3.2.4
--- kolabmailtransport.php	21 Feb 2006 11:58:34 -0000	1.3.2.3
+++ kolabmailtransport.php	8 Mar 2006 20:19:42 -0000	1.3.2.4
@@ -114,7 +114,12 @@
   }
 
   function end() {
-    if (PEAR::isError($this->transport->_send("\r\n.\r\n"))) {
+    if ($this->got_newline) 
+    	$dot = ".\r\n";
+    else
+    	$dot = "\r\n.\r\n";
+
+    if (PEAR::isError($this->transport->_send($dot))) {
       return new PEAR_Error('write to socket failed');
     }
     if (PEAR::isError($error = $this->transport->_parseResponse(250))) {



From cvs at intevation.de  Wed Mar  8 21:33:06 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed,  8 Mar 2006 21:33:06 +0100 (CET)
Subject: steffen: server obmtool.conf,1.174.2.33,1.174.2.34 
Message-ID: <20060308203306.9417010016A@lists.intevation.de>

Author: steffen

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

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

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.174.2.33
retrieving revision 1.174.2.34
diff -u -d -r1.174.2.33 -r1.174.2.34
--- obmtool.conf	11 Jan 2006 16:26:16 -0000	1.174.2.33
+++ obmtool.conf	8 Mar 2006 20:33:04 -0000	1.174.2.34
@@ -23,7 +23,7 @@
     done
 %kolab
     echo "---- boot/build ${NODE} %${CMD} ----"
-    kolab_version="2.0.3";
+    kolab_version="2.0.4-cvs-snapshot-20060308";
     PREFIX=/${CMD};
     loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
     plusloc='+'
@@ -145,7 +145,7 @@
     @install ${altloc}perl-kolab-5.8.7-2.0_20051219
     @install ${altloc}kolabd-1.9.4-20060111 --define kolab_version=$kolab_version
     @install ${altloc}kolab-webadmin-0.4.0-20060111 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-resource-handlers-0.3.9-20060111 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-resource-handlers-0.3.9-20060308 --define kolab_version=$kolab_version
     @check
 
     if test ! -e "/usr/bin/kolab" ; then



From cvs at intevation.de  Wed Mar  8 21:33:06 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed,  8 Mar 2006 21:33:06 +0100 (CET)
Subject: steffen: server/kolab-resource-handlers Makefile, 1.9.2.2,
	1.9.2.3 kolab-resource-handlers.spec, 1.126.2.13, 1.126.2.14 
Message-ID: <20060308203306.9B1D31005C7@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	Makefile kolab-resource-handlers.spec 
Log Message:
Versions

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/Makefile,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -d -r1.9.2.2 -r1.9.2.3
--- Makefile	21 Feb 2006 11:58:34 -0000	1.9.2.2
+++ Makefile	8 Mar 2006 20:33:04 -0000	1.9.2.3
@@ -4,7 +4,7 @@
 
 PACKAGE=kolab-resource-handlers
 VERSION = 0.3.9
-RELEASE=20060221
+RELEASE=20060308
 PEARVERSION = 1.3
 
 RPM = /kolab/bin/openpkg rpm

Index: kolab-resource-handlers.spec
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v
retrieving revision 1.126.2.13
retrieving revision 1.126.2.14
diff -u -d -r1.126.2.13 -r1.126.2.14
--- kolab-resource-handlers.spec	21 Feb 2006 11:58:34 -0000	1.126.2.13
+++ kolab-resource-handlers.spec	8 Mar 2006 20:33:04 -0000	1.126.2.14
@@ -8,7 +8,7 @@
 URL:		http://www.kolab.org/
 Packager:	Steffen Hansen <steffen at klaralvdalens-datakonsult.se> (Klaraelvdalens Datakonsult AB)
 Version:	%{V_kolab_reshndl}
-Release:	20060221
+Release:	20060308
 Class:		JUNK
 License:	GPL
 Group:		MAIL



From cvs at intevation.de  Thu Mar  9 22:23:24 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu,  9 Mar 2006 22:23:24 +0100 (CET)
Subject: martin: server/perl-kolab configure.ac,1.3,1.4 
Message-ID: <20060309212324.5719E1006B8@lists.intevation.de>

Author: martin

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

Modified Files:
	configure.ac 
Log Message:
Martin Konold: Applying --with-perllib=PERLLIB patch from Gunnar Wrobel


Index: configure.ac
===================================================================
RCS file: /kolabrepository/server/perl-kolab/configure.ac,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- configure.ac	14 Jan 2006 22:16:43 -0000	1.3
+++ configure.ac	9 Mar 2006 21:23:22 -0000	1.4
@@ -21,6 +21,13 @@
 )
 AC_SUBST_FILE(distribution)
 
+AC_ARG_WITH([perllib],
+  [AC_HELP_STRING([--with-perllib=PERLLIB],
+     [perl library path])],
+     [perllib=$withval],
+   [perllib=`eval $(perl '-V:installvendorlib'); echo $installvendorlib`])
+AC_SUBST(perllib)
+
 # Checks for libraries.
 
 # Checks for header files.



From cvs at intevation.de  Thu Mar  9 22:27:24 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu,  9 Mar 2006 22:27:24 +0100 (CET)
Subject: martin: server/kolab-webadmin/kolab-webadmin/www/admin/addressbook
	addr.php.in, 1.2, 1.3 
Message-ID: <20060309212724.3788D1006BA@lists.intevation.de>

Author: martin

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

Modified Files:
	addr.php.in 
Log Message:
Martin Konold: Make web admin gui compatible with PHP5 (some extra explicit casts). Patch from Gunnar Wrobel


Index: addr.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook/addr.php.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- addr.php.in	21 Feb 2006 02:32:39 -0000	1.2
+++ addr.php.in	9 Mar 2006 21:27:22 -0000	1.3
@@ -316,7 +316,7 @@
 
 /**** Insert into template and output ***/
 $smarty =& new MySmarty();
-$smarty->assign( 'errors', array_merge($errors,$form->errors) );
+$smarty->assign( 'errors', array_merge((array)$errors,(array)$form->errors) );
 $smarty->assign( 'messages', $messages );
 $smarty->assign( 'heading', $heading );
 $smarty->assign( 'uid', $auth->uid() );



From cvs at intevation.de  Thu Mar  9 22:27:24 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu,  9 Mar 2006 22:27:24 +0100 (CET)
Subject: martin: server/kolab-webadmin/kolab-webadmin/www/admin/administrator
	admin.php.in, 1.1, 1.2 
Message-ID: <20060309212724.3F4831006BC@lists.intevation.de>

Author: martin

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

Modified Files:
	admin.php.in 
Log Message:
Martin Konold: Make web admin gui compatible with PHP5 (some extra explicit casts). Patch from Gunnar Wrobel


Index: admin.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/administrator/admin.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- admin.php.in	5 Feb 2006 20:13:55 -0000	1.1
+++ admin.php.in	9 Mar 2006 21:27:22 -0000	1.2
@@ -357,7 +357,7 @@
 
 $smarty = new MySmarty();
 $smarty->assign( 'topdir', $topdir );
-$smarty->assign( 'errors', array_merge($errors,$form->errors) );
+$smarty->assign( 'errors', array_merge((array)$errors,(array)$form->errors) );
 $smarty->assign( 'uid', $auth->uid() );
 $smarty->assign( 'group', $auth->group() );
 $smarty->assign( 'page_title', $menuitems[$sidx]['title'] );



From cvs at intevation.de  Thu Mar  9 22:27:24 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu,  9 Mar 2006 22:27:24 +0100 (CET)
Subject: martin: server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer
	domainmaintainer.php.in, 1.1, 1.2 
Message-ID: <20060309212724.4827D1006C4@lists.intevation.de>

Author: martin

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

Modified Files:
	domainmaintainer.php.in 
Log Message:
Martin Konold: Make web admin gui compatible with PHP5 (some extra explicit casts). Patch from Gunnar Wrobel


Index: domainmaintainer.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer/domainmaintainer.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- domainmaintainer.php.in	5 Feb 2006 20:13:55 -0000	1.1
+++ domainmaintainer.php.in	9 Mar 2006 21:27:22 -0000	1.2
@@ -337,7 +337,7 @@
 
 $smarty = new MySmarty();
 $smarty->assign( 'topdir', $topdir );
-$smarty->assign( 'errors', array_merge($errors,$form->errors) );
+$smarty->assign( 'errors', array_merge((array)$errors,(array)$form->errors) );
 $smarty->assign( 'uid', $auth->uid() );
 $smarty->assign( 'group', $auth->group() );
 $smarty->assign( 'page_title', $menuitems[$sidx]['title'] );



From cvs at intevation.de  Thu Mar  9 22:27:24 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu,  9 Mar 2006 22:27:24 +0100 (CET)
Subject: martin: server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist
	list.php.in, 1.2, 1.3 
Message-ID: <20060309212724.4422B1006C2@lists.intevation.de>

Author: martin

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

Modified Files:
	list.php.in 
Log Message:
Martin Konold: Make web admin gui compatible with PHP5 (some extra explicit casts). Patch from Gunnar Wrobel


Index: list.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist/list.php.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- list.php.in	22 Feb 2006 00:36:27 -0000	1.2
+++ list.php.in	9 Mar 2006 21:27:22 -0000	1.3
@@ -306,7 +306,7 @@
 
 /**** Insert into template and output ***/
 $smarty =& new MySmarty();
-$smarty->assign( 'errors', array_merge($errors,$form->errors) );
+$smarty->assign( 'errors', array_merge((array)$errors,(array)$form->errors) );
 $smarty->assign( 'heading', $heading );
 $smarty->assign( 'uid', $auth->uid() );
 $smarty->assign( 'group', $auth->group() );



From cvs at intevation.de  Thu Mar  9 22:27:24 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu,  9 Mar 2006 22:27:24 +0100 (CET)
Subject: martin: server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder
	sf.php.in, 1.1, 1.2 
Message-ID: <20060309212724.4F27A1006C5@lists.intevation.de>

Author: martin

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

Modified Files:
	sf.php.in 
Log Message:
Martin Konold: Make web admin gui compatible with PHP5 (some extra explicit casts). Patch from Gunnar Wrobel


Index: sf.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder/sf.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sf.php.in	5 Feb 2006 20:13:55 -0000	1.1
+++ sf.php.in	9 Mar 2006 21:27:22 -0000	1.2
@@ -303,7 +303,7 @@
 
 /**** Insert into template and output ***/
 $smarty =& new MySmarty();
-$smarty->assign( 'errors', array_merge($errors,$form->errors) );
+$smarty->assign( 'errors', array_merge((array)$errors,(array)$form->errors) );
 $smarty->assign( 'heading', $heading );
 $smarty->assign( 'uid', $auth->uid() );
 $smarty->assign( 'group', $auth->group() );



From cvs at intevation.de  Thu Mar  9 22:27:24 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu,  9 Mar 2006 22:27:24 +0100 (CET)
Subject: martin: server/kolab-webadmin/kolab-webadmin/www/admin/user
	index.php.in, 1.1, 1.2 user.php.in, 1.6, 1.7 vacation.php.in,
	1.1, 1.2 
Message-ID: <20060309212724.5343C1006C6@lists.intevation.de>

Author: martin

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

Modified Files:
	index.php.in user.php.in vacation.php.in 
Log Message:
Martin Konold: Make web admin gui compatible with PHP5 (some extra explicit casts). Patch from Gunnar Wrobel


Index: index.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/index.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- index.php.in	5 Feb 2006 20:13:55 -0000	1.1
+++ index.php.in	9 Mar 2006 21:27:22 -0000	1.2
@@ -51,8 +51,8 @@
   if (isset($_SESSION['base_dn'])) $base_dn = $_SESSION['base_dn'];
   else $base_dn = 'k=kolab';
 
-  $privmembers = array_merge( $ldap->groupMembers( "cn=internal,$base_dn", 'admin' ),
-							  $ldap->groupMembers( "cn=internal,$base_dn", 'maintainer' ) );
+  $privmembers = array_merge( (array)$ldap->groupMembers( "cn=internal,$base_dn", 'admin' ),
+							  (array)$ldap->groupMembers( "cn=internal,$base_dn", 'maintainer' ) );
 
   $userfilter = "cn=*";
   $filterattr = $_REQUEST['filterattr'];

Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- user.php.in	7 Mar 2006 11:47:45 -0000	1.6
+++ user.php.in	9 Mar 2006 21:27:22 -0000	1.7
@@ -824,7 +824,7 @@
 
 $smarty = new MySmarty();
 $smarty->assign( 'topdir', $topdir );
-$smarty->assign( 'errors', array_merge($errors,$form->errors) );
+$smarty->assign( 'errors', array_merge((array)$errors,(array)$form->errors) );
 $smarty->assign( 'uid', $auth->uid() );
 $smarty->assign( 'group', $auth->group() );
 $smarty->assign( 'page_title', $menuitems[$sidx]['title'] );

Index: vacation.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/vacation.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- vacation.php.in	5 Feb 2006 20:13:55 -0000	1.1
+++ vacation.php.in	9 Mar 2006 21:27:22 -0000	1.2
@@ -75,7 +75,7 @@
   } else $reacttospam = true;
   if( $addresses === false ) {
 	$object = $ldap->read( $auth->dn() );
-	$addresses = array_merge( $object['mail'], $object['alias'] );
+	$addresses = array_merge( (array)$object['mail'], (array)$object['alias'] );
   }
   if( $days === false ) $days = 7;
   if( $text === false ) {



From cvs at intevation.de  Thu Mar  9 22:27:24 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu,  9 Mar 2006 22:27:24 +0100 (CET)
Subject: martin: server/kolab-webadmin/kolab-webadmin/www/admin/maintainer
	maintainer.php.in, 1.1, 1.2 
Message-ID: <20060309212724.55E031006C7@lists.intevation.de>

Author: martin

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

Modified Files:
	maintainer.php.in 
Log Message:
Martin Konold: Make web admin gui compatible with PHP5 (some extra explicit casts). Patch from Gunnar Wrobel


Index: maintainer.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/maintainer/maintainer.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- maintainer.php.in	5 Feb 2006 20:13:55 -0000	1.1
+++ maintainer.php.in	9 Mar 2006 21:27:22 -0000	1.2
@@ -348,7 +348,7 @@
 
 $smarty = new MySmarty();
 $smarty->assign( 'topdir', $topdir );
-$smarty->assign( 'errors', array_merge($errors,$form->errors) );
+$smarty->assign( 'errors', array_merge((array)$errors,(array)$form->errors) );
 $smarty->assign( 'uid', $auth->uid() );
 $smarty->assign( 'group', $auth->group() );
 $smarty->assign( 'page_title', $menuitems[$sidx]['title'] );



From cvs at intevation.de  Thu Mar  9 22:35:10 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu,  9 Mar 2006 22:35:10 +0100 (CET)
Subject: martin: server/kolabd/kolabd kolabquotawarn.in,1.9,1.10 
Message-ID: <20060309213510.B66091006B4@lists.intevation.de>

Author: martin

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

Modified Files:
	kolabquotawarn.in 
Log Message:
Martin Konold:  Variable smarty library location as patch from Gunnar Wrobel. Autoconf changes are still missing


Index: kolabquotawarn.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabquotawarn.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- kolabquotawarn.in	2 Feb 2006 17:15:43 -0000	1.9
+++ kolabquotawarn.in	9 Mar 2006 21:35:08 -0000	1.10
@@ -3,7 +3,7 @@
 ##
 ##  Copyright (c) 2004 Klarälvdalens Datakonsult AB
 ##
-##    Writen by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
+##    Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
 ##
 ##  This  program is free  software; you can redistribute  it and/or
 ##  modify it  under the terms of the GNU  General Public License as



From cvs at intevation.de  Thu Mar  9 22:35:10 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu,  9 Mar 2006 22:35:10 +0100 (CET)
Subject: martin: server/kolabd/kolabd/dist_conf common, 1.23, 1.24 debian, 1.4,
	1.5 kolab, 1.29, 1.30 mandriva, 1.3, 1.4 suse, 1.38, 1.39 
Message-ID: <20060309213510.CB0991006B7@lists.intevation.de>

Author: martin

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

Modified Files:
	common debian kolab mandriva suse 
Log Message:
Martin Konold:  Variable smarty library location as patch from Gunnar Wrobel. Autoconf changes are still missing


Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- common	2 Mar 2006 20:40:38 -0000	1.23
+++ common	9 Mar 2006 21:35:08 -0000	1.24
@@ -84,6 +84,7 @@
 	-e 's,[@]kolab_mgrp[@],$(kolab_mgrp),g' \
 	-e 's,[@]kolab_musr[@],$(kolab_musr),g' \
 	-e 's,[@]kolab_php_module_prefix[@],$(kolab_php_module_prefix),g' \
+	-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' \

Index: debian
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/debian,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- debian	18 Jan 2006 19:54:43 -0000	1.4
+++ debian	9 Mar 2006 21:35:08 -0000	1.5
@@ -82,6 +82,7 @@
 kolab_logdir=${localstatedir}/log/kolab
 kolab_pidfile=${sysrundir}/kolab.pid
 kolab_mailboxuiddb=${kolab_statedir}/mailbox-uidcache.db
+kolab_php_smarty_prefix=Smarty
 
 ldapserver_statedir=${localstatedir}/lib/ldap
 ldapserver_dir=${localstatedir}/lib/ldap

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- kolab	2 Mar 2006 20:40:38 -0000	1.29
+++ kolab	9 Mar 2006 21:35:08 -0000	1.30
@@ -117,6 +117,7 @@
 kolab_smtpdpolicy_conffile_usr=${kolab_musr}
 kolab_smtpdpolicy_conffile_grp=${kolab_grp}
 kolab_php_module_prefix=
+kolab_php_smarty_prefix=Smarty
 
 ldapserver_statedir=${localstatedir}/openldap
 ldapserver_dir=${ldapserver_statedir}/openldap-data

Index: mandriva
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/mandriva,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mandriva	23 Dec 2005 22:16:54 -0000	1.3
+++ mandriva	9 Mar 2006 21:35:08 -0000	1.4
@@ -9,6 +9,7 @@
 
 kolabd_usr=root
 kolab_statedir = ${localstatedir}/kolab
+kolab_php_smarty_prefix=Smarty
 
 sasl_confdir = ${sysconfdir}
 

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- suse	2 Mar 2006 20:40:38 -0000	1.38
+++ suse	9 Mar 2006 21:35:08 -0000	1.39
@@ -102,6 +102,8 @@
 # /usr/share/php. This prevents scattering of the kolab php files.
 kolab_php_module_prefix=kolab/
 
+kolab_php_smarty_prefix=Smarty
+
 ldapserver_statedir=${localstatedir}/lib/ldap
 ldapserver_dir=${localstatedir}/lib/ldap
 ldapserver_replogfile=${localstatedir}/log/replog



From cvs at intevation.de  Thu Mar  9 22:37:39 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu,  9 Mar 2006 22:37:39 +0100 (CET)
Subject: martin: server/kolabd/kolabd/dist_conf common, 1.24, 1.25 debian, 1.5,
	1.6 kolab, 1.30, 1.31 mandriva, 1.4, 1.5 suse, 1.39, 1.40 
Message-ID: <20060309213739.2A8A41006BA@lists.intevation.de>

Author: martin

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

Modified Files:
	common debian kolab mandriva suse 
Log Message:
Martin Konold: Apply patch from Gunnar Wrobel. (Make resmgr_scriptsdir a variable)


Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- common	9 Mar 2006 21:35:08 -0000	1.24
+++ common	9 Mar 2006 21:37:37 -0000	1.25
@@ -118,6 +118,7 @@
 	-e 's,[@]resmgr_filterdir[@],$(resmgr_filterdir),g' \
 	-e 's,[@]resmgr_grp[@],$(resmgr_grp),g' \
 	-e 's,[@]resmgr_logfile[@],$(resmgr_logfile),g' \
+	-e 's,[@]resmgr_scriptsdir[@],$(resmgr_scriptsdir),g' \
 	-e 's,[@]resmgr_usr[@],$(resmgr_usr),g' \
 	-e 's,[@]sasl_authdconffile[@],$(sasl_authdconffile),g' \
 	-e 's,[@]sasl_logfile[@],$(sasl_logfile),g' \

Index: debian
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/debian,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- debian	9 Mar 2006 21:35:08 -0000	1.5
+++ debian	9 Mar 2006 21:37:37 -0000	1.6
@@ -126,6 +126,7 @@
 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
 

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- kolab	9 Mar 2006 21:35:08 -0000	1.30
+++ kolab	9 Mar 2006 21:37:37 -0000	1.31
@@ -171,6 +171,7 @@
 resmgr_conffile_usr=${kolab_musr}
 resmgr_conffile_grp=${kolab_grp}
 resmgr_filterdir=${localstatedir}/resmgr/filter
+resmgr_scriptsdir=${resmgr_confdir}
 # @l_musr@
 resmgr_usr=kolab
 # @l_ngrp@

Index: mandriva
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/mandriva,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mandriva	9 Mar 2006 21:35:08 -0000	1.4
+++ mandriva	9 Mar 2006 21:37:37 -0000	1.5
@@ -66,3 +66,4 @@
 
 sysrundir = /var/run
 
+resmgr_scriptsdir=${resmgr_confdir}

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- suse	9 Mar 2006 21:35:08 -0000	1.39
+++ suse	9 Mar 2006 21:37:37 -0000	1.40
@@ -150,6 +150,7 @@
 resmgr_conffile_usr=nobody
 resmgr_conffile_grp=nobody
 resmgr_filterdir=${localstatedir}/resmgr/filter
+resmgr_scriptsdir=${resmgr_confdir}
 resmgr_usr=root
 resmgr_grp=root
 
@@ -182,3 +183,4 @@
 	/etc/sysconfig/ldap \
 	/etc/sysconfig/saslauthd \
 	/usr/lib/sasl2/smtpd.conf
+



From cvs at intevation.de  Thu Mar  9 22:37:39 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu,  9 Mar 2006 22:37:39 +0100 (CET)
Subject: martin: server/kolabd/kolabd/templates master.cf.template.in, 1.9,
	1.10 
Message-ID: <20060309213739.37B991006BC@lists.intevation.de>

Author: martin

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

Modified Files:
	master.cf.template.in 
Log Message:
Martin Konold: Apply patch from Gunnar Wrobel. (Make resmgr_scriptsdir a variable)


Index: master.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- master.cf.template.in	4 Feb 2006 18:19:58 -0000	1.9
+++ master.cf.template.in	9 Mar 2006 21:37:37 -0000	1.10
@@ -88,7 +88,7 @@
 
 kolabfilter     unix  -       n       n       -       -       pipe user=@emailserver_master_usr@ flags=n argv=@bindir@/php
     -c @webserver_confdir@/php.ini
-    -f @resmgr_confdir@/kolabfilter.php 
+    -f @resmgr_scriptsdir@/kolabfilter.php 
     --
     -h @@@fqdnhostname@@@
     -s ${sender}
@@ -98,7 +98,7 @@
 
 kolabmailboxfilter     unix  -       n       n       -       -       pipe user=@emailserver_master_usr@ flags=n argv=@bindir@/php
     -c @webserver_confdir@/php.ini
-    -f @resmgr_confdir@/kolabmailboxfilter.php 
+    -f @resmgr_scriptsdir@/kolabmailboxfilter.php 
     --
     -h @@@fqdnhostname@@@
     -s ${sender}



From cvs at intevation.de  Thu Mar  9 22:40:07 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu,  9 Mar 2006 22:40:07 +0100 (CET)
Subject: martin: server/kolabd/kolabd kolab_bootstrap.in,1.21,1.22 
Message-ID: <20060309214007.5C79C1006B4@lists.intevation.de>

Author: martin

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

Modified Files:
	kolab_bootstrap.in 
Log Message:
Martin Konold: Apply patch from Gunnar Wrobel (make user setting for running ldap server explicit)


Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- kolab_bootstrap.in	2 Mar 2006 20:40:37 -0000	1.21
+++ kolab_bootstrap.in	9 Mar 2006 21:40:05 -0000	1.22
@@ -436,6 +436,7 @@
       }
       undef $slpd;
       undef $tmpl;
+      kolab_chown "@ldapserver_usr@","@ldapserver_grp@","@ldapserver_confdir@/slapd.conf";
       
       my $tmplname = "@sysconfdir@/kolab/templates/slapd.replicas.template";
       $confname = "@ldapserver_confdir@/slapd.replicas";
@@ -456,6 +457,7 @@
       }
       undef $slpd;
       undef $tmpl;
+      kolab_chown "@ldapserver_usr@","@ldapserver_grp@",$confname;
 		
       $tmplname = "@sysconfdir@/kolab/templates/slapd.access.template";
       $confname = "@ldapserver_confdir@/slapd.access";
@@ -476,11 +478,14 @@
       }
       undef $slpd;
       undef $tmpl;
+      kolab_chown "@ldapserver_usr@","@ldapserver_grp@",$confname;
 		
       # now we must startup slapd
       print "temporarily starting slapd\n";
       $ldap_uri = "ldap://127.0.0.1:389/";
-      (system("@libexecdir@/openldap/slapd -h ldap://127.0.0.1:389/ -f @ldapserver_confdir@/slapd.conf") == 0 ) || die( "Could not start temporary slapd: $!" );
+      # ensure that the database has correct permissions
+      system("chown @ldapserver_rusr@:@ldapserver_grp@ @ldapserver_dir@/*");
+      (system("@libexecdir@/openldap/slapd -h ldap://127.0.0.1:389/ -f @ldapserver_confdir@/slapd.conf -u @ldapserver_rusr@ -g @ldapserver_grp@") == 0 ) || die( "Could not start temporary slapd: $!" );
       print ("Waiting for OpenLDAP to start\n");
       sleep 10;
 



From cvs at intevation.de  Thu Mar  9 22:40:07 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu,  9 Mar 2006 22:40:07 +0100 (CET)
Subject: martin: server/kolabd/kolabd/dist_conf common, 1.25, 1.26 debian, 1.6,
	1.7 kolab, 1.31, 1.32 mandriva, 1.5, 1.6 suse, 1.40, 1.41 
Message-ID: <20060309214007.63CBD1006B8@lists.intevation.de>

Author: martin

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

Modified Files:
	common debian kolab mandriva suse 
Log Message:
Martin Konold: Apply patch from Gunnar Wrobel (make user setting for running ldap server explicit)


Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- common	9 Mar 2006 21:37:37 -0000	1.25
+++ common	9 Mar 2006 21:40:05 -0000	1.26
@@ -105,6 +105,7 @@
 	-e 's,[@]ldapserver_pidfile[@],$(ldapserver_pidfile),g' \
 	-e 's,[@]ldapserver_replogfile[@],$(ldapserver_replogfile),g' \
 	-e 's,[@]ldapserver_rgrp[@],$(ldapserver_rgrp),g' \
+	-e 's,[@]ldapserver_rusr[@],$(ldapserver_rusr),g' \
 	-e 's,[@]ldapserver_schemadir[@],$(ldapserver_schemadir),g' \
 	-e 's,[@]ldapserverslurpd_pidfile[@],$(ldapserverslurpd_pidfile),g' \
 	-e 's,[@]ldapserver_statedir[@],$(ldapserver_statedir),g' \

Index: debian
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/debian,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- debian	9 Mar 2006 21:37:37 -0000	1.6
+++ debian	9 Mar 2006 21:40:05 -0000	1.7
@@ -95,6 +95,7 @@
 ldapserver_confdir=${sysconfdir}/ldap
 ldapserver_usr=ldap
 ldapserver_grp=ldap
+ldapserver_rusr=ldap
 
 webserver_document_root=/var/www
 webserver_cgidir=${webserver_document_root}/cgi-bin

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- kolab	9 Mar 2006 21:37:37 -0000	1.31
+++ kolab	9 Mar 2006 21:40:05 -0000	1.32
@@ -134,6 +134,7 @@
 # @l_mgrp@
 ldapserver_grp=kolab
 ldapserver_rgrp=kolab-r
+ldapserver_rusr=kolab
 
 webserver_document_root=${localstatedir}/kolab/www
 webserver_cgidir=${webserver_document_root}/cgi-bin

Index: mandriva
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/mandriva,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mandriva	9 Mar 2006 21:37:37 -0000	1.5
+++ mandriva	9 Mar 2006 21:40:05 -0000	1.6
@@ -53,6 +53,7 @@
 ldapserver_argsfile=/var/run/ldap/slapd.args
 ldapserver_usr=ldap
 ldapserver_grp=ldap
+ldapserver_rusr=ldap
 
 webserver_document_root=/var/www/html/kolab
 webserver_logdir=/var/log/httpd

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- suse	9 Mar 2006 21:37:37 -0000	1.40
+++ suse	9 Mar 2006 21:40:05 -0000	1.41
@@ -116,6 +116,7 @@
 ldapserver_usr=ldap
 ldapserver_grp=ldap
 ldapserver_rgrp=ldap
+ldapserver_rusr=ldap
 
 webserver_document_root=/srv/www/htdocs
 webserver_cgidir=${webserver_document_root}/cgi-bin



From cvs at intevation.de  Thu Mar  9 22:46:32 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu,  9 Mar 2006 22:46:32 +0100 (CET)
Subject: martin: server/kolabd/kolabd/dist_conf gentoo,1.3,1.4 
Message-ID: <20060309214632.8F0141006AB@lists.intevation.de>

Author: martin

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

Modified Files:
	gentoo 
Log Message:
Martin Konold: New Gentoo dist_conf file from Gunnar Wrobel


Index: gentoo
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/gentoo,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gentoo	23 Dec 2005 22:16:54 -0000	1.3
+++ gentoo	9 Mar 2006 21:46:30 -0000	1.4
@@ -1,67 +1,301 @@
-kolab_usr=kolab-n               # @l_nusr@
-kolab_grp=kolab-n               # @l_ngrp@
-kolab_uid=1002                  # @l_nuid@
-kolab_gid=1002                  # @l_ngid@
-restricted_kolab_usr=kolab-r    # @l_rusr@
-restricted_kolab_grp=kolab-r    # @l_rgrp@
+sysrundir=${localstatedir}/run
+logdir=${localstatedir}/log
+statelibdir=${localstatedir}/lib
+wwwdir=${localstatedir}/www
 
-rcdir=${sysconfdir}/rc
+# @l_nusr@
+kolab_usr=kolab-n
+# @l_ngrp@
+kolab_grp=kolab-n
+# @l_musr@
+kolab_musr=kolab
+# @l_mgrp@
+kolab_mgrp=kolab
+# @l_nuid@
+kolab_uid=1002
+# @l_ngid@
+kolab_gid=1002
+# @l_rusr@
+kolab_rusr=kolab-r
+# @l_rgrp@
+kolab_rgrp=kolab-r
+# @l_susr@
+kolab_susr=root
 
-kolabd_usr=root
-kolab_statedir = ${localstatedir}/lib/kolab
+# Access to ssl certs
+pki_grp=${kolab_rgrp}
 
-sasl_confdir = ${sysconfdir}/sasl2
+BASHELL=/bin/bash
+PERL=${bindir}/perl
+PHP=${bindir}/php
 
-imap_confdir=${sysconfdir}
-imap_confperm=0644
-imap_usr=root
-imap_grp=root
+# FIXME: This could be used to provide an external wrapper for the 
+#        rc scripts rather than patching the code
+KOLABRC=${bindir}/openpkg
+
+RPM=${KOLABRC} rpm
+
+# Define the deamons that are executed with openpkg rc
+LDAPD=openldap
+
+kolab_rcdir=${sysconfdir}/rc.d
+# FIXME: Would be nice if we could specify the doc-dir from the outside too.
+#        But currently the Makefile.am automatically adds the plain package name
+pkgdocdir=${datadir}/doc
+
+fsl_logfile=${localstatedir}/fsl/fsl.log
+
+#####################################################################
+# Clamav parameters
+
+### -> users
+
+clamav_rusr=clamav
+clamav_usr=root
+clamav_grp=root
+
+### -> files
 
-clamav_socket=${localstatedir}/clamav/clamd.sock
-clamav_logfile=${localstatedir}/clamav/clamd.log
-clamav_pidfile=${localstatedir}/clamav/clamd.pid
 clamav_confdir=${sysconfdir}
+clamav_statedir=${statelibdir}/clamav
+clamav_datadir=${clamav_statedir}
+clamav_socket=${clamav_statedir}/clamd.sock
+clamav_logfile=${clamav_statedir}/clamd.log
+clamav_pidfile=${clamav_statedir}/clamd.pid
+freshclam_logfile=${clamav_statedir}/freshclam.log
+freshclam_pidfile=${clamav_statedir}/freshclam.pid
 
+#--------------------------------------------------------------------
 
-emailscan_usr=${restricted_kolab_usr}
-emailscan_grp=${restricted_kolab_grp}
+#####################################################################
+# Amavis parameters
 
+### -> users
+
+amavisd_rusr=amavis
+amavisd_usr=root
+amavisd_grp=amavis
+
+### -> files
+
+amavisd_confdir=${sysconfdir}
+amavisd_conffile=${sysconfdir}/amavisd.conf
+amavisd_templatedir=${sysconfdir}/amavisd/templates
+amavisd_logfile=${logdir}/amavis.log
+amavisd_home=${localstatedir}/amavis
+
+#--------------------------------------------------------------------
+
+#####################################################################
+# Postfix parameters
+
+### -> users
+
+emailserver_usr=root
+emailserver_grp=root
+emailserver_mail_owner=postfix
+emailserver_setgid_grp=postdrop
+emailserver_master_usr=kolab-n
+emailserver_default_privs=nobody
+
+### -> files
+
+emailserver_localstatedir=${localstatedir}/spool/postfix
+emailserver_confdir=${sysconfdir}/postfix
 emailserver_socket=${localstatedir}/kolab/lmtp
-emailserver_localstatedir=${localstatedir}/postfix
-emailserver_sasl_conffile=${sasl_confdir}/apps/smtpd.conf
-emailserver_usr=${kolab_usr}
-emailserver_grp=${restricted_kolab_grp}
-emailserver_mail_usr=kolab              # = @l_musr@
+emailserver_logfile=${emailserver_localstatedir}/log/postfix.log
 
-ftpserver_scoreboardfile=${localstatedir}/proftpd/score
-ftpserver_logfile=${localstatedir}/proftpd/proftpd.log
-ftpserver_pidfile=${localstatedir}/run/proftpd.pid
+#--------------------------------------------------------------------
+
+#####################################################################
+# Postfix parameters
+
+### -> files
+
+sasl_authdconffile=${sysconfdir}/sasl2/saslauthd.conf
+sasl_smtpconffile=${sysconfdir}/sasl2/smtpd.conf
+sasl_logfile=${localstatedir}/log/saslauthd.log
+
+#--------------------------------------------------------------------
+
+#####################################################################
+# Are these needed?
+
+emailscan_usr=kolab-r
+emailscan_grp=kolab-r
+
+#####################################################################
+# Imapd parameters
+
+### -> users
+
+imap_usr=cyrus
+imap_grp=mail
+
+### -> files
+
+imap_confperm=0644
+imap_confdir=${sysconfdir}
+imap_statedir=${localstatedir}/imap
+
+imap_masterlogfile=${imap_statedir}/log/master.log
+imap_misclogfile=${imap_statedir}/log/misc.log
+imap_spool=${imap_statedir}/spool
+imap_sievedir=${imap_statedir}/sieve
+imap_lmtp=${imap_statedir}/lmtp
+
+#####################################################################
+# Proftpd parameters
+
+### -> users
+
+ftpserver_musr=kolab
+ftpserver_usr=nobody
+ftpserver_grp=nobody
+# Why hardcoded uid/gid???
+ftpserver_uid=65534
+ftpserver_gid=65534
+
+### -> files
+
+ftpserver_scoreboardfile=${sysrundir}/proftpd/score
+ftpserver_logfile=${logdir}/proftpd.log
 ftpserver_confdir=${sysconfdir}/proftpd
-ftpserver_usr=${kolab_usr}
-ftpserver_grp=${kolab_grp}
-ftpserver_uid=19416
-ftpserver_gid=19416
+ftpserver_pidfile=${sysrundir}/proftpd/proftpd.pid
 
-kolab_logdir=${localstatedir}/kolab/log
-kolab_pidfile=${localstatedir}/kolab/kolab.pid
+#--------------------------------------------------------------------
 
-ldapserver_dir=${localstatedir}/lib/openldap-data
-ldapserver_rundir=${localstatedir}/lib/openldap/run
-ldapserver_schemadir=${sysconfdir}/openldap/schema
-ldapserver_replogfile=${localstatedir}/lib/openldap/replog
-ldapserver_argsfile=${localstatedir}/lib/openldap/slapd.args
-ldapserver_usr=ldap
+#####################################################################
+# LDAP parameters
+
+### -> users
+
+ldapserver_rusr=ldap
+ldapserver_usr=root
 ldapserver_grp=ldap
+ldapserver_rgrp=kolab-r
 
-webserver_document_root=${localstatedir}/kolab/www
-webserver_logdir=${localstatedir}/apache/log
-webadmindir = ${libdir}
-webserver_confdir=${sysconfdir}/apache/conf
+### -> config files
+
+ldapserver_confdir=${sysconfdir}/openldap
+ldapserver_schemadir=${ldapserver_confdir}/schema
+
+### -> state files
+
+ldapserver_statedir=${statelibdir}/openldap
+ldapserver_dir=${statelibdir}/openldap-data
+
+### -> log files
+
+ldapserver_replogfile=${logdir}/openldap/replog
+ldapserver_logfile=${logdir}/openldap/openldap.log
+
+### -> runtime files
+
+ldapserver_rundir=${localstatedir}/run/openldap
+
+ldapserver_pidfile=${ldapserver_rundir}/slapd.pid
+ldapserverslurpd_pidfile=${ldapserver_rundir}/slurpd.pid
+ldapserver_argsfile=${ldapserver_rundir}/slapd.args
+
+#--------------------------------------------------------------------
+
+#####################################################################
+# Apache parameters
+
+### -> users
+
+webserver_musr=apache
+webserver_usr=apache
+webserver_grp=apache
+
+webserver_confdir=${sysconfdir}/apache2
+webserver_logdir=${logdir}/apache2
+webserver_errorlogfile=${webserver_logdir}/apache-error.log
+webserver_accesslogfile=${webserver_logdir}/apache-access.log
+webserver_acceptlock=${webserver_logdir}/accept.lock
+webserver_runtime_status=${webserver_logdir}/apache_runtime_status
+webserver_sessions=${kolab_statedir}/httpd_sessions
+
+webserver_document_root=${wwwdir}/kolab
+webserver_cgidir=${webserver_document_root}/cgi-bin
 webserver_pidfile=${localstatedir}/apache/run/apache.pid
 webserver_mime_magicfile=${sysconfdir}/apache/mime.magic
 webserver_mime_typesfile=${sysconfdir}/apache/mime.types
-webserver_usr=${kolab_usr}
-webserver_grp=${kolab_grp}
+webserver_sslscache=${webserver_logdir}/ssl_scache
+webserver_sslmutex=${webserver_logdir}/ssl_mutex
+# webserver_web_prefix is empty indeed
+webserver_web_prefix=
 
-sysrundir = ${localstatedir}/run
+#####################################################################
+# PHP parameters
+
+phplibdir=${datadir}/php
+phplibdir2=${datadir}/php
+phppeardir=${phplibdir}/horde
+kolab_php_module_prefix=kolab/
+kolab_php_smarty_prefix=smarty/
+
+#--------------------------------------------------------------------
+
+#####################################################################
+# Kolabd parameters
+
+### -> users
+
+kolab_smtpdpolicy_conffile_usr=${kolab_musr}
+kolab_smtpdpolicy_conffile_grp=${kolab_grp}
+
+### -> files
+
+kolab_statedir=${statelibdir}/kolab
+kolab_logdir=${logdir}/kolab
+kolab_scriptsdir=${datadir}/kolabd/scripts
+kolab_pidfile=${kolab_statedir}/kolab.pid
+kolab_mailboxuiddb=${kolab_statedir}/mailbox-uidcache.db
+
+### -> backup
+
+backupdir=${sysconfdir}/kolab
+backupfiles=${amavisd_conffile}              \
+	    ${clamav_confdir}/clamd.conf     \
+	    ${imap_confdir}/cyrus.conf       \
+	    ${imap_confdir}//imapd.conf      \
+	    ${clamav_confdir}/freshclam.conf \
+	    ${ldapserver_confdir}/ldap.conf  \
+	    ${ldapserver_confdir}/slapd.conf \
+	    ${emailserver_confdir}/main.cf   \
+	    ${emailserver_confdir}/master.cf \
+	    ${emailserver_confdir}/transport \
+	    ${emailserver_confdir}/virtual   \
+            ${sysconfdir}/conf.d/apache2     \
+            ${sysconfdir}/conf.d/saslauthd
+	    
+#--------------------------------------------------------------------
+
+#####################################################################
+# Kolab-resource-handlers parameters
+
+### -> users
+
+resmgr_usr=kolab
+resmgr_grp=kolab-n
+resmgr_conffile_usr=${kolab_musr}
+resmgr_conffile_grp=${kolab_grp}
+
+### -> files
+
+resmgr_logfile=${kolab_logdir}/resmgr/resmgr.log
+resmgr_confdir=${sysconfdir}/kolab/resmgr
+resmgr_filterdir=${kolab_statedir}/resmgr/filter
+resmgr_scriptsdir=${datadir}/kolabd/resmgr/scripts
+
+#--------------------------------------------------------------------
+
+fbview_logfile=${localstatedir}/resmgr/fbview.log
+freebusy_logfile=${localstatedir}/resmgr/freebusy.log
+freebusy_cachedir=${webserver_document_root}/freebusy/cache
+
+graveyard_uidcache=${localstatedir}/kolab/graveyard_uidcache.db
+graveyard_tscache=${localstatedir}/kolab/graveyard_tscache.db
 



From cvs at intevation.de  Thu Mar  9 22:52:04 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu,  9 Mar 2006 22:52:04 +0100 (CET)
Subject: martin: server/kolabd/kolabd Makefile.am, 1.20,
	1.21 kolab_bootstrap.in, 1.22, 1.23 
Message-ID: <20060309215204.1AF481006B7@lists.intevation.de>

Author: martin

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

Modified Files:
	Makefile.am kolab_bootstrap.in 
Log Message:
Martin Konold: Applied "Relocating scripts from /etc" from Gunnar Wrobel


Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Makefile.am	8 Feb 2006 20:29:31 -0000	1.20
+++ Makefile.am	9 Mar 2006 21:52:02 -0000	1.21
@@ -13,7 +13,7 @@
 # is sometimes used in this file
 kolabconfdir = $(sysconfdir)/kolab
 
-kolabdir = $(sysconfdir)/kolab
+kolabdir = $(kolab_scriptsdir)
 
 if OPENPKG
   KOLAB_SCRIPTS_FILES = kolab

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- kolab_bootstrap.in	9 Mar 2006 21:40:05 -0000	1.22
+++ kolab_bootstrap.in	9 Mar 2006 21:52:02 -0000	1.23
@@ -700,10 +700,10 @@
 certificate. You will be prompted for a passphrase for the CA.
 ################################################################################
 EOS
-    kolab_system("@sysconfdir@/kolab/kolab_ca.sh -newca $fqdn");
-    kolab_system("@sysconfdir@/kolab/kolab_ca.sh -newkey $fqdn @sysconfdir@/kolab/key.pem");
-    kolab_system("@sysconfdir@/kolab/kolab_ca.sh -newreq $fqdn @sysconfdir@/kolab/key.pem @sysconfdir@/kolab/newreq.pem ");
-    kolab_system("@sysconfdir@/kolab/kolab_ca.sh -sign @sysconfdir@/kolab/newreq.pem @sysconfdir@/kolab/cert.pem");
+    kolab_system("@kolab_scriptsdir@/kolab_ca.sh -newca $fqdn");
+    kolab_system("@kolab_scriptsdir@/kolab_ca.sh -newkey $fqdn @sysconfdir@/kolab/key.pem");
+    kolab_system("@kolab_scriptsdir@/kolab_ca.sh -newreq $fqdn @sysconfdir@/kolab/key.pem @sysconfdir@/kolab/newreq.pem ");
+    kolab_system("@kolab_scriptsdir@/kolab_ca.sh -sign @sysconfdir@/kolab/newreq.pem @sysconfdir@/kolab/cert.pem");
     kolab_system("chgrp @pki_grp@ @sysconfdir@/kolab/key.pem;");
     kolab_system("chmod 0640 @sysconfdir@/kolab/key.pem;");
     kolab_system("chgrp @pki_grp@ @sysconfdir@/kolab/cert.pem;");
@@ -883,11 +883,11 @@
 EOS
 
     # Create cert req
-    kolab_system("@sysconfdir@/kolab/kolab_ca.sh -newkey $fqdn @sysconfdir@/kolab/key.pem");
-    kolab_system("@sysconfdir@/kolab/kolab_ca.sh -newreq $fqdn @sysconfdir@/kolab/key.pem @sysconfdir@/kolab/newreq.pem ");
+    kolab_system("@kolab_scriptsdir@/kolab_ca.sh -newkey $fqdn @sysconfdir@/kolab/key.pem");
+    kolab_system("@kolab_scriptsdir@/kolab_ca.sh -newreq $fqdn @sysconfdir@/kolab/key.pem @sysconfdir@/kolab/newreq.pem ");
     # Log into master and sign cert request
     kolab_system("scp @sysconfdir@/kolab/newreq.pem $master_host:@sysconfdir@/kolab/$fqdn-req.pem");
-    kolab_system("ssh -CA $master_host \"@sysconfdir@/kolab/kolab_ca.sh -sign @sysconfdir@/kolab/$fqdn-req.pem @sysconfdir@/kolab/$fqdn.pem;\"");
+    kolab_system("ssh -CA $master_host \"@kolab_scriptsdir@/kolab_ca.sh -sign @sysconfdir@/kolab/$fqdn-req.pem @sysconfdir@/kolab/$fqdn.pem;\"");
     kolab_system("scp $master_host:@sysconfdir@/kolab/$fqdn.pem @sysconfdir@/kolab/cert.pem");
     kolab_system("ssh -CA $master_host \"rm @sysconfdir@/kolab/$fqdn.pem @sysconfdir@/kolab/$fqdn-req.pem\"");
     die("Creation of @sysconfdir@/kolab/cert.pem failed") unless -f "@sysconfdir@/kolab/cert.pem";



From cvs at intevation.de  Thu Mar  9 22:52:04 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu,  9 Mar 2006 22:52:04 +0100 (CET)
Subject: martin: server/kolabd/kolabd/dist_conf common, 1.26, 1.27 debian, 1.7,
	1.8 kolab, 1.32, 1.33 mandriva, 1.6, 1.7 suse, 1.41, 1.42 
Message-ID: <20060309215204.2893B1006B8@lists.intevation.de>

Author: martin

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

Modified Files:
	common debian kolab mandriva suse 
Log Message:
Martin Konold: Applied "Relocating scripts from /etc" from Gunnar Wrobel


Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- common	9 Mar 2006 21:40:05 -0000	1.26
+++ common	9 Mar 2006 21:52:02 -0000	1.27
@@ -91,6 +91,7 @@
 	-e 's,[@]kolab_rgrp[@],$(kolab_rgrp),g' \
 	-e 's,[@]kolab_rpm[@],$(kolab_rpm),g' \
 	-e 's,[@]kolab_rusr[@],$(kolab_rusr),g' \
+	-e 's,[@]kolab_scriptsdir[@],$(kolab_scriptsdir),g' \
 	-e 's,[@]kolab_statedir[@],$(kolab_statedir),g' \
 	-e 's,[@]kolab_smtpdpolicy_conffile_grp[@],$(kolab_smtpdpolicy_conffile_grp),g' \
 	-e 's,[@]kolab_smtpdpolicy_conffile_usr[@],$(kolab_smtpdpolicy_conffile_usr),g' \

Index: debian
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/debian,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- debian	9 Mar 2006 21:40:05 -0000	1.7
+++ debian	9 Mar 2006 21:52:02 -0000	1.8
@@ -82,6 +82,7 @@
 kolab_logdir=${localstatedir}/log/kolab
 kolab_pidfile=${sysrundir}/kolab.pid
 kolab_mailboxuiddb=${kolab_statedir}/mailbox-uidcache.db
+kolab_scriptsdir=$(sysconfdir)/kolab
 kolab_php_smarty_prefix=Smarty
 
 ldapserver_statedir=${localstatedir}/lib/ldap

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- kolab	9 Mar 2006 21:40:05 -0000	1.32
+++ kolab	9 Mar 2006 21:52:02 -0000	1.33
@@ -117,6 +117,7 @@
 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
 
 ldapserver_statedir=${localstatedir}/openldap

Index: mandriva
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/mandriva,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- mandriva	9 Mar 2006 21:40:05 -0000	1.6
+++ mandriva	9 Mar 2006 21:52:02 -0000	1.7
@@ -45,6 +45,7 @@
 
 kolab_logdir=/var/log/kolab
 kolab_pidfile=/var/run/kolab/kolab.pid
+kolab_scriptsdir=$(sysconfdir)/kolab
 
 ldapserver_dir=${localstatedir}/ldap-kolab
 ldapserver_rundir=/var/run/ldap

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- suse	9 Mar 2006 21:40:05 -0000	1.41
+++ suse	9 Mar 2006 21:52:02 -0000	1.42
@@ -96,6 +96,7 @@
 perl_kolab_rpm=perl-kolab
 kolab_smtpdpolicy_conffile_usr=root
 kolab_smtpdpolicy_conffile_grp=nobody
+kolab_scriptsdir=$(sysconfdir)/kolab
 
 # 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 intevation.de  Thu Mar  9 22:52:04 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu,  9 Mar 2006 22:52:04 +0100 (CET)
Subject: martin: server/kolabd/kolabd/templates master.cf.template.in, 1.10,
	1.11 
Message-ID: <20060309215204.2A3CA1006BA@lists.intevation.de>

Author: martin

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

Modified Files:
	master.cf.template.in 
Log Message:
Martin Konold: Applied "Relocating scripts from /etc" from Gunnar Wrobel


Index: master.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- master.cf.template.in	9 Mar 2006 21:37:37 -0000	1.10
+++ master.cf.template.in	9 Mar 2006 21:52:02 -0000	1.11
@@ -84,7 +84,7 @@
     -o smtpd_error_sleep_time=0
     -o smtpd_soft_error_limit=1001
     -o smtpd_hard_error_limit=1000
-kolabpolicy    unix  -       n       n       -       -       spawn user=@emailserver_master_usr@ argv=@sysconfdir@/kolab/kolab_smtpdpolicy 
+kolabpolicy    unix  -       n       n       -       -       spawn user=@emailserver_master_usr@ argv=@kolab_scriptsdir@/kolab_smtpdpolicy 
 
 kolabfilter     unix  -       n       n       -       -       pipe user=@emailserver_master_usr@ flags=n argv=@bindir@/php
     -c @webserver_confdir@/php.ini



From cvs at intevation.de  Sat Mar 11 21:37:57 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat, 11 Mar 2006 21:37:57 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog,1.64,1.65 
Message-ID: <20060311203757.77D6C1006A4@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
change te ldap replication log location.  This
seems to solve the issue that changes in the webinterface are not
propagated to the backend, as administrated in issue 1068:
https://intevation.de/roundup/kolab/issue1068.
In the old location the directory was not writable by the ldap
daemon, in the new location /var/run/slapd/ it is.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- ChangeLog	2 Mar 2006 20:40:37 -0000	1.64
+++ ChangeLog	11 Mar 2006 20:37:55 -0000	1.65
@@ -1,3 +1,11 @@
+2006-03-11 Richard Bos <richard at radoeka.nl>
+	* dist_conf/suse, change te ldap replication log location.  This
+	  seems to solve the issue that changes in the webinterface are not
+	  propagated to the backend, as administrated in issue 1068:
+	  https://intevation.de/roundup/kolab/issue1068.
+	  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>
 	Patch committed by Richard Bos
 	* dist_conf/common, dist_conf/kolab, dist_conf/suse,



From cvs at intevation.de  Sat Mar 11 21:37:57 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat, 11 Mar 2006 21:37:57 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf suse,1.42,1.43 
Message-ID: <20060311203757.83F351006AA@lists.intevation.de>

Author: richard

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

Modified Files:
	suse 
Log Message:
change te ldap replication log location.  This
seems to solve the issue that changes in the webinterface are not
propagated to the backend, as administrated in issue 1068:
https://intevation.de/roundup/kolab/issue1068.
In the old location the directory was not writable by the ldap
daemon, in the new location /var/run/slapd/ it is.



Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- suse	9 Mar 2006 21:52:02 -0000	1.42
+++ suse	11 Mar 2006 20:37:55 -0000	1.43
@@ -107,7 +107,7 @@
 
 ldapserver_statedir=${localstatedir}/lib/ldap
 ldapserver_dir=${localstatedir}/lib/ldap
-ldapserver_replogfile=${localstatedir}/log/replog
+ldapserver_replogfile=${sysrundir}/slapd/replog
 ldapserver_argsfile=${localstatedir}/log/slapd.args
 ldapserver_logfile=${localstatedir}/log/openldap.log
 ldapserver_pidfile=${sysrundir}/slapd.pid



From cvs at intevation.de  Sat Mar 11 22:39:19 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat, 11 Mar 2006 22:39:19 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf kolabsrv.in,1.6,1.7 
Message-ID: <20060311213919.0E19D1006A4@lists.intevation.de>

Author: richard

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

Modified Files:
	kolabsrv.in 
Log Message:
Slurpd is needed ...., so start it



Index: kolabsrv.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolabsrv.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- kolabsrv.in	2 Mar 2006 20:41:13 -0000	1.6
+++ kolabsrv.in	11 Mar 2006 21:39:16 -0000	1.7
@@ -38,7 +38,7 @@
 esac
 
 if [[ "$2" == "all" ]]; then
-	SERVICES="@LDAPD@ saslauthd spamd amavis apache2 freshclam clamd cyrus postfix"
+	SERVICES="@LDAPD@ slurpd saslauthd spamd amavis apache2 freshclam clamd cyrus postfix"
 	SERVICES="$SERVICES kolabd"
 else
 	SERVICES=$2



From cvs at intevation.de  Thu Mar 16 11:46:42 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu, 16 Mar 2006 11:46:42 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog,1.65,1.66 
Message-ID: <20060316104642.076251006AD@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
run as user kolab instead of nobody

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- ChangeLog	11 Mar 2006 20:37:55 -0000	1.65
+++ ChangeLog	16 Mar 2006 10:46:39 -0000	1.66
@@ -1,3 +1,7 @@
+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.
+
 2006-03-11 Richard Bos <richard at radoeka.nl>
 	* dist_conf/suse, change te ldap replication log location.  This
 	  seems to solve the issue that changes in the webinterface are not



From cvs at intevation.de  Thu Mar 16 11:46:42 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu, 16 Mar 2006 11:46:42 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf suse,1.43,1.44 
Message-ID: <20060316104642.096111006B0@lists.intevation.de>

Author: richard

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

Modified Files:
	suse 
Log Message:
run as user kolab instead of nobody

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- suse	11 Mar 2006 20:37:55 -0000	1.43
+++ suse	16 Mar 2006 10:46:39 -0000	1.44
@@ -59,8 +59,8 @@
 emailserver_grp=root
 emailserver_mail_owner=postfix
 emailserver_setgid_grp=maildrop
-emailserver_default_privs=nobody
-emailserver_master_usr=nobody
+emailserver_default_privs=kolab
+emailserver_master_usr=kolab
 emailserver_rpm=postfix
 
 ftpserver_scoreboardfile=${localstatedir}/proftpd/score
@@ -94,8 +94,8 @@
 kolab_resource_handlers_rpm=kolab-resource-handlers
 kolab_webadmin_rpm=kolab-webadmin
 perl_kolab_rpm=perl-kolab
-kolab_smtpdpolicy_conffile_usr=root
-kolab_smtpdpolicy_conffile_grp=nobody
+kolab_smtpdpolicy_conffile_usr=kolab
+kolab_smtpdpolicy_conffile_grp=root
 kolab_scriptsdir=$(sysconfdir)/kolab
 
 # This variable makes it possible to store all kolab php modules in its own
@@ -147,10 +147,10 @@
 sasl_authdconffile=${sysconfdir}/saslauthd.conf
 sasl_logfile=${localstatedir}/log/saslauthd.log
 
-resmgr_logfile=${localstatedir}/log/resmgr.log
+resmgr_logfile=${localstatedir}/log/kolab/resmgr.log
 resmgr_confdir=${sysconfdir}/kolab/resmgr
-resmgr_conffile_usr=nobody
-resmgr_conffile_grp=nobody
+resmgr_conffile_usr=kolab
+resmgr_conffile_grp=root
 resmgr_filterdir=${localstatedir}/resmgr/filter
 resmgr_scriptsdir=${resmgr_confdir}
 resmgr_usr=root



From cvs at intevation.de  Thu Mar 16 12:14:09 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu, 16 Mar 2006 12:14:09 +0100 (CET)
Subject: bernhard: utils/admin kolab_vacation_tool, 1.2,
	1.3 kolab_vacation_tool.README, 1.2, 1.3 
Message-ID: <20060316111409.BFC251006B2@lists.intevation.de>

Author: bernhard

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

Modified Files:
	kolab_vacation_tool kolab_vacation_tool.README 
Log Message:
Added an usleep(500000) to avoid direct reconnection attempts to sieve.
verbosity>0 will also write a message that the script sleeps.


Index: kolab_vacation_tool
===================================================================
RCS file: /kolabrepository/utils/admin/kolab_vacation_tool,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolab_vacation_tool	20 Jan 2006 17:11:50 -0000	1.2
+++ kolab_vacation_tool	16 Mar 2006 11:14:07 -0000	1.3
@@ -252,6 +252,12 @@
     foreach($errors as $line) {
       fwrite(STDOUT, $line."\n");
     }
+    /* sleep a bit to avoid flooding the system with processes. */
+    /* trying half a second = 500 000 micro seconds*/
+    usleep(500000);
+    if ($verbosity > 0) {
+      fwrite(STDOUT, "Sleeping a bit.\n");
+    }
   }
 }
 

Index: kolab_vacation_tool.README
===================================================================
RCS file: /kolabrepository/utils/admin/kolab_vacation_tool.README,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolab_vacation_tool.README	20 Jan 2006 17:11:50 -0000	1.2
+++ kolab_vacation_tool.README	16 Mar 2006 11:14:07 -0000	1.3
@@ -25,5 +25,12 @@
 $ kolab_vacation_tool --help
 
 
+News
+----
+Since Revision 1.3 the script waits for half a second in case of an error
+before trying the next user.
+If timsieved does not start, the script before Rev 1.3 would try right away
+which might cause further strain on the cyrus system.
+
 
 $Id$



From cvs at intevation.de  Thu Mar 16 13:26:25 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu, 16 Mar 2006 13:26:25 +0100 (CET)
Subject: bernhard: utils/admin kolab_vacation_tool, 1.3,
	1.4 kolab_vacation_tool.README, 1.3, 1.4 
Message-ID: <20060316122625.543E71006B1@lists.intevation.de>

Author: bernhard

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

Modified Files:
	kolab_vacation_tool kolab_vacation_tool.README 
Log Message:
Added cleanup of connections.


Index: kolab_vacation_tool
===================================================================
RCS file: /kolabrepository/utils/admin/kolab_vacation_tool,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolab_vacation_tool	16 Mar 2006 11:14:07 -0000	1.3
+++ kolab_vacation_tool	16 Mar 2006 12:26:23 -0000	1.4
@@ -119,6 +119,8 @@
   $addresses = $days = $text = false;
   if( PEAR::isError( $scripts = $sieve->listScripts() ) ) {
     $errors[] = $scripts->getMessage();
+    /* try to disconnect anyway (without recording further errors) */
+    $sieve->disconnect();
     return $errors;
   }
   if( in_array( $scriptname, $scripts ) ) {
@@ -157,9 +159,12 @@
       $errors[] = $res->getMessage();
       $errors[] = 'Script was:';
       $errors[] = $script;
+      /* try to disconnect anyway (without recording further errors) */
+      $sieve->disconnect();
       return $errors;
     }
 
+
     if ($verbosity == 0) {
       fwrite(STDOUT, "$user on $host: updated\n");
     }
@@ -179,8 +184,18 @@
         fwrite(STDOUT, "$user on $host: react to spam unchanged: ");
       fwrite(STDOUT, ($new_dontreacttospam?"NO\n":"YES\n"));
     }
+
   }
 
+  if ($verbosity > 1) {
+    fwrite(STDOUT, "Trying to explicitely disconnect the Sieve connection.\n");
+  }
+
+  $result = $sieve->disconnect();
+  if( PEAR::isError( $result->_error ) ) {
+    $errors[] = $result->getMessage();
+    return $errors;
+  }
 }
 
 

Index: kolab_vacation_tool.README
===================================================================
RCS file: /kolabrepository/utils/admin/kolab_vacation_tool.README,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolab_vacation_tool.README	16 Mar 2006 11:14:07 -0000	1.3
+++ kolab_vacation_tool.README	16 Mar 2006 12:26:23 -0000	1.4
@@ -27,10 +27,12 @@
 
 News
 ----
-Since Revision 1.3 the script waits for half a second in case of an error
-before trying the next user.
-If timsieved does not start, the script before Rev 1.3 would try right away
-which might cause further strain on the cyrus system.
+Revision 1.4:
+	Try to close the connections to timsieved after a user is done.
 
+Revision 1.3:
+	Waiting half a second in case of an error, before trying the next user.
+	Trying right away might cause further strain on the system,
+	e.g. when timsieved has a general problem.
 
 $Id$



From cvs at intevation.de  Fri Mar 17 20:20:05 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri, 17 Mar 2006 20:20:05 +0100 (CET)
Subject: bh: server release-notes.txt,1.35,1.36 
Message-ID: <20060317192005.1862910016A@lists.intevation.de>

Author: bh

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

Modified Files:
	release-notes.txt 
Log Message:
some updates for the next beta release


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- release-notes.txt	3 Feb 2006 14:34:54 -0000	1.35
+++ release-notes.txt	17 Mar 2006 19:20:02 -0000	1.36
@@ -1,5 +1,5 @@
 Release notes Kolab2 Server
-(Version, Kolab Server pre 2.1)
+(Version 2006XXXX, Kolab Server 2.1 beta 2)
 
 This is a development snapshot of the kolab server leading up to a 2.1
 release.  For upgrading and installation instructions, please refer to
@@ -27,11 +27,9 @@
       Issue1098 (Changes in the service tab are not accepted after
       bootstrap) for details.
 
-    - Distribution lists without domain (like those created for
-      administative addresses in the services tab) break when edited
-      via the web interface, see Issue1100 for details.
-      A workaround is to manually create those lists for every domain
-      configured in the server.
+    - Distribution lists without domain (as created by earlier 2.1
+      releases, for instance) break when edited via the web interface,
+      see Issue1100 for details.
 
     - If modifying or deleting of address book entries doesn't work,
       restarting openldap can help, see Issue854 for details.
@@ -40,62 +38,39 @@
       for details.
 
 
-Changes since 2.1-20051215:
+Changes since 2.1 beta 1:
 
     OpenPKG updates:
 
-      - clamav-0.88-20060110
-
-	Fixes UPX compressed file heap buffer overflow (CVE-2006-0162)
-
-	Details:
-	  http://www.clamav.net/doc/0.88/ChangeLog
-	  http://www.securityfocus.com/bid/16191
-
-      - openpkg-registry-0.2.5-20051129
-
-	New package
-
+      - openpkg-registry-0.2.7-20060223
+      - php-smarty-2.6.10-20051003
 
     Kolab updates:
 
-      All kolab specific packages contain more distconf changes
-      by Richard Bos and Markus Hüwe.
-
-      The webserver prefix is configurable now.
+      More distconf changes by Richard Bos and Markus Hüwe.
 
-      - kolab-horde-fbview-2.0.99-20051220
+      - perl-kolab-5.8.7-20060228
 
-      - kolab-horde-framework-2.0.99-20051220
+      - kolabd-2.0.99-20060228
 
-      - kolab-resource-handlers-2.0.99-20060201
+	* amavis now logs to /kolab/var/amavisd/amavisd.log.  This is
+          part of the fix for Issue1015
 
-	* Resolved:
-	    Issue1010 (new build-mechanism)
+        Resolved:
+	    Issue1015 (fixing logging and logrotate for amavisd)
+	    Issue1089 (enable hashimapspool for imapd to cope with many users)
+	    Issue1101 (allowapop: no; disable apop access to imapd by default)
+	    Issue1105 (fix compilation of kolabd on FreeBSD)
 
-      - kolab-webadmin-2.0.99-20060201
+      - kolab-webadmin-2.0.99-20060228
 
-	* Resolved:
-	    Issue730  (Cannot rename user in Kolab2 Admin interface)
-	    Issue809  (kolab web-admin dutch locale)
-	    Issue848  (remove deleted users from distribution lists)
-	    Issue1007 (kolab-webadmin autoconfiscation patch)
-	    Issue1023 (fix some typos in messages)
+      - kolab-resource-handlers-2.0.99-20060308
 
-      - kolabd-2.0.99-20060203
+        Resolved:
+	    Issue1042 (server modifies email content)
 
-	* Resolved:
-	    Issue768  (virtual.template changes not picked up by kolabconf)
-	    Issue1012 (make koilabquotawarn log when it sends warning mails)
-	    Issue1027 (kolab showuser doesn't work)
-	    Issue1046 (fix an openpkg rc call in kolab_bootstrap)
-	    Issue1038 (remove perl-kolab/configure from repository)
-	    Issue1050 (Make DLs work for sending email)
 
-      - perl-kolab-5.8.7-20060201
 
-	* Resolved:
-	    Issue1022 (autoconfiscation patch for perl-kolab)
 
 
 



From cvs at intevation.de  Mon Mar 20 22:06:53 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon, 20 Mar 2006 22:06:53 +0100 (CET)
Subject: richard: server/kolabd/kolabd/templates master.cf.template.in, 1.11,
	1.12 
Message-ID: <20060320210653.026531005B9@lists.intevation.de>

Author: richard

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

Modified Files:
	master.cf.template.in 
Log Message:
Introduce a new variable for the directory that holds the
php.ini file to be used.



Index: master.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- master.cf.template.in	9 Mar 2006 21:52:02 -0000	1.11
+++ master.cf.template.in	20 Mar 2006 21:06:50 -0000	1.12
@@ -87,7 +87,7 @@
 kolabpolicy    unix  -       n       n       -       -       spawn user=@emailserver_master_usr@ argv=@kolab_scriptsdir@/kolab_smtpdpolicy 
 
 kolabfilter     unix  -       n       n       -       -       pipe user=@emailserver_master_usr@ flags=n argv=@bindir@/php
-    -c @webserver_confdir@/php.ini
+    -c @phpini_dir@/php.ini
     -f @resmgr_scriptsdir@/kolabfilter.php 
     --
     -h @@@fqdnhostname@@@
@@ -97,7 +97,7 @@
     -u ${sasl_username}
 
 kolabmailboxfilter     unix  -       n       n       -       -       pipe user=@emailserver_master_usr@ flags=n argv=@bindir@/php
-    -c @webserver_confdir@/php.ini
+    -c @phpini_dir@/php.ini
     -f @resmgr_scriptsdir@/kolabmailboxfilter.php 
     --
     -h @@@fqdnhostname@@@



From cvs at intevation.de  Mon Mar 20 22:06:53 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon, 20 Mar 2006 22:06:53 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf common, 1.27, 1.28 kolab, 1.33,
	1.34 suse, 1.44, 1.45 
Message-ID: <20060320210653.06E051005BC@lists.intevation.de>

Author: richard

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

Modified Files:
	common kolab suse 
Log Message:
Introduce a new variable for the directory that holds the
php.ini file to be used.



Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- common	9 Mar 2006 21:52:02 -0000	1.27
+++ common	20 Mar 2006 21:06:50 -0000	1.28
@@ -7,6 +7,7 @@
 	-e 's,[@]datadir[@],$(datadir),g' \
 	-e 's,[@]libexecdir[@],$(libexecdir),g' \
 	-e 's,[@]localstatedir[@],$(localstatedir),g' \
+	-e 's,[@]phpini_dir[@],$(phpini_dir),g' \
 	-e 's,[@]phplibdir[@],$(phplibdir),g' \
 	-e 's,[@]phplibdir2[@],$(phplibdir2),g' \
 	-e 's,[@]phppeardir[@],$(phppeardir),g' \

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- kolab	9 Mar 2006 21:52:02 -0000	1.33
+++ kolab	20 Mar 2006 21:06:50 -0000	1.34
@@ -158,6 +158,7 @@
 webserver_grp=${kolab_grp}
 webserver_rpm=apache
 
+phpini_dir=${sysconfdir}/apache
 phplibdir=${libdir}/php
 phplibdir2=${kolab_statedir}/php
 phppeardir=${phplibdir2}/pear

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- suse	16 Mar 2006 10:46:39 -0000	1.44
+++ suse	20 Mar 2006 21:06:50 -0000	1.45
@@ -121,7 +121,7 @@
 
 webserver_document_root=/srv/www/htdocs
 webserver_cgidir=${webserver_document_root}/cgi-bin
-webserver_sessions=${localstatedir}/kolab/httpd_sessions
+webserver_sessions=${localstatedir}/lib/php
 webserver_logdir=${localstatedir}/log/apache2
 webserver_acceptlock=${webserver_logdir}/accept.lock
 webserver_runtime_status=${webserver_logdir}/apache_runtime_status
@@ -139,7 +139,8 @@
 webserver_grp=www
 webserver_rpm=apache2
 
-phplibdir=${datadir}/php
+phpini_dir=${sysconfdir}
+phplibdir=${datadir}/php:/srv/www/htdocs/horde/lib
 phplibdir2=${datadir}/php
 phppeardir=${phplibdir}/PEAR
 



From cvs at intevation.de  Tue Mar 21 20:52:27 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 21 Mar 2006 20:52:27 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf suse,1.45,1.46 
Message-ID: <20060321195227.51750100160@lists.intevation.de>

Author: richard

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

Modified Files:
	suse 
Log Message:
better scripts location

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- suse	20 Mar 2006 21:06:50 -0000	1.45
+++ suse	21 Mar 2006 19:52:25 -0000	1.46
@@ -96,7 +96,7 @@
 perl_kolab_rpm=perl-kolab
 kolab_smtpdpolicy_conffile_usr=kolab
 kolab_smtpdpolicy_conffile_grp=root
-kolab_scriptsdir=$(sysconfdir)/kolab
+kolab_scriptsdir=$(datadir)/kolab/scripts
 
 # 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 +153,7 @@
 resmgr_conffile_usr=kolab
 resmgr_conffile_grp=root
 resmgr_filterdir=${localstatedir}/resmgr/filter
-resmgr_scriptsdir=${resmgr_confdir}
+resmgr_scriptsdir=$(datadir)/kolab/scripts/resmgr
 resmgr_usr=root
 resmgr_grp=root
 



From cvs at intevation.de  Wed Mar 22 11:41:15 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 22 Mar 2006 11:41:15 +0100 (CET)
Subject: bernhard: doc/raw-howtos move-rename-user.txt,NONE,1.1 
Message-ID: <20060322104115.75C1E1005C1@lists.intevation.de>

Author: bernhard

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

Added Files:
	move-rename-user.txt 
Log Message:
Adding new raw instruction document.


--- NEW FILE: move-rename-user.txt ---
How to migrate a set of users to another server while potentially renaming.
---------------------------------------------------------------------------
Principal Author: Bernhard Reiter
Relevance: Kolab Server 2.0.x, Kolab Server 2.1.x
Tested with Kolab Server 2.1.0-beta1

Goal: Manually move a user from one server and domain to another, 
      potentially renaming it on the way. 

Remarks: 
      Manually means: using the command line as root on both servers.
      It probably is more elegant and desireable 
      to implement all this with a tool that speaks imap.
      Nevertheless, this text contains some hints for manual intervention
      for the experienced administrator. 

Old user: 	user.a at old.example.org
New user: 	user.b at new.example.org

We need to consider:
	Emails
		Permissions
		Quota
		Annotations
		Seen DB
		Subscriptions
		

	Notes:  no problem expected.
	Tasks:  might be interesting if a task has been delegated (TODO)
	Contacts: no problem expected for the user.
		  Other might have saved the old email address,
		  see calendar items below.

	LDAP entries:  outside the scope of this instructions
		Quota
		FreeBusy Intervall
 
	Calendar-Items:  an alias for the old email address might be handy
		         for updates to reach everybody and freebusy lists.
		Subcases: a) Organiser (TODO)
			  b) Attendee (TODO)

Instructions:
-------------

a) Make sure no email comes in and the user cannot log in.

b) Create the fresh user user.b at new.example.org on the new server
   via the directory server.
   This account should also have the right quota for the quotaroot.

c) Most recovery operations have to be done as Cyrus user, so switch to it.
 	su - kolab-r

d) For better comparison, dump out the mailbox.db
   (You do have a backup of both servers anyway, right?)

	ctl_mboxlist -d >mailbox-dump-old.txt

e) Copy the files from the old server, including the cyrus.* 
   E.g. if on the same file system:
	cp -a imapd/spool/domain/old.example.org/user/user^a \
	      imapd/spool/domain/new.example.org/user/user^b

f) Before reconstruction, we have to decide where to get the information from
   that will populate the mailboxes.db.

   cyrreconstruct -f (without -x) will use some out of cyrus.header 
   and cyrus.index. But cyrus.header still contains the old domain
   and email names for quota root and permissions.

   We can fix this by replacing this information in the copied files.
   There are many unix ways to do this, my suggestion is rpl
   (the Free Software implementation in Python from Debian
    http://packages.qa.debian.org/r/rpl.html ).

   We only have one quota root to fix, so here one replacement will do:

         rpl -R -xcyrus.header 'old.example.org!user.user^a' \
                                'new.example.org!user.user^b'   ./user^b

  But permissions might have granted for several other users.
  Assuming that we move them all from old.example.org to new.example.org,
  we can adjust all domain parts:

   rpl -R -xcyrus.header '@old.example.org' '@new.example.org' ./user^b
 
  Now for each changed user name, we can do a replacement like:

   rpl -R -xcyrus.header 'user.a@' 'user.b@' user^b

  If only a part of the users is moved,
  a detailed list for the replacements have to be used.

e) Now we can add the new user to the mailboxes.db:
	cyrreconstruct -rf user/user^b at new.example.org

   For a double check, have a look at the difference
	ctl_mboxlist -d >mailbox-dump-new.txt
        diff mailbox-dump-old.txt mailbox-dump-new.txt

f) The /vendor/kolab annotations should be copied, 
   because they indicate what a folder contains, e.g. a calendar.

   There is a perl script listannotations.pl in
	http://kolab.org/cgi-bin/viewcvs-kolab.cgi/utils/admin/
   which can help a bit, see the documentation within the script how to use it.

g) The "Seen" db saves which email is unread and which read.
   To preserve this information (optional), we can try to copy it over.
   Depending on the structure of the new mailbox, 
   this might not work, but it is worth a try:

 	cp -a ./domain/o/old.example.org/user/a/user^a.seen \
	      ./domain/n/new.example.org/user/b/user^b.seen

h) Optionally we can preserve the information which folders the user
   subscribed, to.
	cp -a ./domain/o/old.example.org/user/a/user^a.sub \
	      ./domain/n/new.example.org/user/b/user^b.sub
   Now again we need to replace the old user and domain with the new one:
         rpl -R -x cyrus.header 'old.example.org!user.user^a' \
                                'new.example.org!user.user^b'   ./user^b

i) Fix the quota (for all users)
	cyrquota -f

$Id: move-rename-user.txt,v 1.1 2006/03/22 10:41:13 bernhard Exp $



From cvs at intevation.de  Wed Mar 22 20:34:31 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 22 Mar 2006 20:34:31 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/www/admin/user
	user.php.in, 1.7, 1.8 
Message-ID: <20060322193431.2DA8D1006CA@lists.intevation.de>

Author: richard

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

Modified Files:
	user.php.in 
Log Message:
replaced $kolab_prefix/etc by @sysconfidir@



Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- user.php.in	9 Mar 2006 21:27:22 -0000	1.7
+++ user.php.in	22 Mar 2006 19:34:29 -0000	1.8
@@ -486,11 +486,11 @@
 		 */
 		 if( false && isset( $_POST['accttype'] ) && $_POST['accttype'] > 1 ) {
 		   // We have a group or resource, create encrypted pw
-		   $pubkeydata=file_get_contents("$kolab_prefix/etc/kolab/res_pub.pem" );		   
+		   $pubkeydata=file_get_contents("@sysconfdir@/kolab/res_pub.pem" );		   
 		   $pkey = openssl_pkey_get_public( $pubkeydata );
 		   if( $pkey === false ) {
-			 $sslerr = sprintf(_("Could not read resource encryption public key file://%s/etc/kolab/res_pub.pem: "), 
-							   $kolab_prefix);
+			 $sslerr = "Could not read resource encryption public key file://@sysconfdir@/kolab/res_pub.pem: "; 
+							   
 			 while( $msg = openssl_error_string() )
 			   $sslerr .= $msg.' ';
 			 $errors[] = $sslerr;



From cvs at intevation.de  Wed Mar 22 20:34:31 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 22 Mar 2006 20:34:31 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog,1.21,1.22 
Message-ID: <20060322193431.2B2551006C9@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
replaced $kolab_prefix/etc by @sysconfidir@



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- ChangeLog	7 Mar 2006 11:39:23 -0000	1.21
+++ ChangeLog	22 Mar 2006 19:34:28 -0000	1.22
@@ -1,3 +1,8 @@
+2006-03-22 Marcus Hüwe <suse-tux at gmx.de>
+	Patch committed by Richard Bos
+	* www/admin/user/user.php.in: replaced $kolab_prefix/etc by
+	  @sysconfidir@
+
 2006-03-07 Bernhard Reiter <bernhard at intevation.de>
 	* www/admin/user/index.php.in: Renamed Deletages to Email-Delegates
 	in $entries['kolabdelegate'] and checkdelegate(). Also improved



From cvs at intevation.de  Fri Mar 24 11:39:08 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri, 24 Mar 2006 11:39:08 +0100 (CET)
Subject: torsten: utils/testing remove_kolab_doubles.py,NONE,1.1 
Message-ID: <20060324103908.898FE1006B8@lists.intevation.de>

Author: torsten

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

Added Files:
	remove_kolab_doubles.py 
Log Message:
Added a short script for "removing" duplicated appointment in a mailfolder.


--- NEW FILE: remove_kolab_doubles.py ---
#!/usr/bin/env python
"""Tries to remove Kolab Event files doubled in a very special way.

Will search the current working directory for files like [1-9][0-9]*.
WARNING: This is a script for a one time situation! Only run under supervision!

Usage: unpackmail -d movetodirectory [--dry-run]

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

    -d directory
    --directory=directory
        Doubles will be moved to this directory.
        If directory does not exits, it will be created.

Roughly testing with Python2.1 on woody (needs python2.1-xml)
and a backported python2.1-email package.
"""

#initial 20060323/24 Bernhard <bernhard at intevation.de>
#
# This program is free software under the GNU GPL (>=v2)
# Read the file COPYING coming with the software for details.

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

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

import re
import md5

import xml.dom.minidom


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

def main():
    try:
        opts, args = getopt.getopt(sys.argv[1:], 'hd:', ['help', 'directory=', 'dry-run'])
    except getopt.error, msg:
        usage(1, msg)

    dir = None
    dryrun = 0
    for opt, arg in opts:
        if opt in ('-h', '--help'):
            usage(0)
        elif opt in ('-d', '--directory'):
            dir = arg
        elif opt == '--dry-run':
            dryrun=1

    if not dir:
        usage(1,"Need a directory to move files to.\n")

    if not dryrun:
        try:
            os.mkdir(dir)
        except OSError, e:
            # Ignore directory exists error
            if e.errno <> errno.EEXIST: raise

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

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

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

    # let us put build a dictionary with the object checksum as key
    # and a list of filesnames that have the same checksum
    # E.g. for one entry: { "h3u5o6uid", ["19374.",  "19375.",  "19376." ] }
    compareheap = { }

    count = 0
    for file in filelist:
        count += 1
        if (count % 100 == 0):
            sys.stdout.write(".")
            sys.stdout.flush()

        if verbose > 1: print 'Dealing with "%s"' % file
        fp = open(file)
        msg = email.message_from_file(fp)
        fp.close()

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

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

        if not kolabeventxml: continue

        # We want to find files that are the same but differ only
        # in the <uid> and <last-modifucation-dat> elements
        # so we clean those elements from the xml for comparison.

        comparexml = cookcomparexml(kolabeventxml)

        try:
            # md5 only eat regular strings, but cookcomparexml returns unicode
            hash = md5.new(comparexml).digest()
        except:
            sys.stderr.write("Trouble hashing file %s!\n" % file)
            raise

        if not compareheap.has_key(hash):
            compareheap[hash] = [ file ]
        else:
            compareheap[hash].append(file)
    print "completed." # scanning

    print "Found %d Kolab Event Objects.\n" % len(compareheap)

    if dryrun:
        print "Dry-run enabled. WOULD move away:"
    else:
        print "Moving away:"

    for object in compareheap.keys():
        filenamelist= compareheap[object]
        if len(filenamelist) > 1:
            # we have found similiar files
            # one to take

            if verbose > 1: print filenamelist
            # sort it after the numeric value
            filenamelist.sort(comparecyrusmsgnames)

            # move away the lower numbered ones
            for file in filenamelist[:-1]:
                print '"%s"' % file,
                if not dryrun:
                    os.rename(file, os.path.join(dir,file))

    print "Done."

def comparecyrusmsgnames(a,b):
    """Compares cyrus msg file names numerically like '121.' is > '20.' ."""
    x=int(a[:-1])
    y=int(b[:-1])

    if x < y: return -1
    elif x > y: return 1
    return 0


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

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

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

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

    if verbose > 3: print kolabxml

    return kolabxml

def cookcomparexml(kolabxml):
    """Remove special elements from a kolabxml string."""

    dom = xml.dom.minidom.parseString(kolabxml)
    event=dom.firstChild
    for child in event.childNodes:
        if child.nodeType == dom.ELEMENT_NODE:
            #if child.tagName in ['summary']:
            #    print child, child.firstChild.data.encode("latin-1")
            if child.tagName in ['uid', 'last-modification-date',]:
                #print child, child.firstChild.data
                event.removeChild(child)

    cleanedxml = dom.toxml().encode("utf-8","replace")
    dom.unlink()

    if verbose > 2: print cleanedxml

    return cleanedxml

if __name__ == '__main__':
    main()



From cvs at intevation.de  Sun Mar 26 01:24:40 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 26 Mar 2006 01:24:40 +0100 (CET)
Subject: wilde: utils/admin validate-skiplist.c,NONE,1.1 
Message-ID: <20060326002440.C557C1006B0@lists.intevation.de>

Author: wilde

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

Added Files:
	validate-skiplist.c 
Log Message:
New file validate-skiplist.c -- a simple cyrus skiplist validator.

--- NEW FILE: validate-skiplist.c ---
/* -------------------------------------------------------------------
   validate-skiplist

   Copyright (C) 2006 by Sascha Wilde <wilde at sha-bang.de>

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

   This little tool does a simple syntactic evaluation on cyrus
   skiplist database files.

   It does no semantic checking, no log replay, and _no_ locking (so
   don't use it on files used by a running system.)

   WARNING:

   This is only tested on little endian systems and will most likely
   break on big endian machines!

*/

#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
#include <unistd.h>
#include <err.h>

#define INFO(blk) if (verbose) { blk }
#define WARN(blk) if (warnings) { blk }

int verbose  = 0;
int warnings = 0;


/* skiplist stuff: */
#define MAGICNUM 0xa1028b0d
#define INORDER 1
#define ADD 2
#define DELETE 4
#define COMMIT 255
#define DUMMY 257

/* statistics */
int inorder = 0;
int add = 0;
int delete = 0;
int commit = 0;

void
print_usage ()
{
  puts ("Usage: validate-skiplist [OPTIONS] [FILE]");
  puts ("Validate cyrus skiplist FILE.\n");

  puts ("  -w  print out non fatal warnings");
  puts ("  -v  be verbose");
  puts ("  -h  print this help message and exit");
  exit (0);
}


int32_t
read_word (FILE *file)
{
  int i, c;
  int32_t word = 0;
  for (i = 0; i < 4; i++)
    {
      word = word << 8;
      if ((c = fgetc (file)) == EOF)
	errx (1, "Unexpected end of file at 0x%X", ftell (file));
      word += c;
    }
  return word;
}

void
jump_to_position (FILE *file, long pos)
{
  if (fseek (file, pos, SEEK_SET) == -1)
    errx (1, "Unexpected end of file at 0x%X", ftell (file));
}


void
commit_maybe (FILE *file)
{
  if (read_word (file) == COMMIT)
    {
      ++commit;
    }
  else
    fseek (file, -4, SEEK_CUR);
}


void
add_delete (FILE *file)
{
  int32_t word;
  word = read_word (file);
  switch (word)
    {
    case ADD:
      /* FIXME: we should inspect add nodes more in depth. */
      while (read_word (file) != 0xffffffff) /* skip till termination */
      ++add;
      break;
    case DELETE:
      read_word (file);
      ++delete;
      break;
    default:
      errx (1, "Bad node: expected ADD or DELETE at 0x%X! (found %i)", 
	    ftell (file), word);
    }
  commit_maybe (file);
}


void
validate_file (char* filename)
{
  int i,c;
  int32_t word;
  long logstart;
  FILE *file;

  INFO (printf ("Checking file \"%s\"\n", filename););

  if (!(file = fopen (filename, "r")))
    err (1, "%s", filename);

  WARN (word = read_word (file); /* magic number */
	if (word != MAGICNUM)
	  printf ("Strange magic number %X expected %X\n", word, MAGICNUM);
	);

  INFO (jump_to_position (file, 20); /* jump to version numbers */
	printf ("Skiplist file Version %i.", read_word (file));
	printf ("%i\n", read_word (file));
	printf ("Max level: %i\n", read_word (file));
	printf ("Current level: %i\n", read_word (file));
	printf ("%i active items\n", read_word (file));
	);

  jump_to_position (file, 40);
  logstart = read_word (file);

  INFO (printf ("Log start at 0x%X\n", logstart);
	word = read_word (file);
	printf ("Last recovery on %s\n", ctime (&word));
	);

  jump_to_position (file, 48);
  if ((word = read_word (file)) != DUMMY)
    errx (1, "First skipnode is not of type DUMMY (found %i)\n", word);

  jump_to_position (file, logstart);
  INFO (puts ("Checking log part..."););

  while ((c = getc (file)) != EOF)
    {
      ungetc (c, file);
      add_delete (file);
    } 

  INFO (printf ("Found %i ADD, %i DELETE and %i COMMIT nodes in log.\n",
		add, delete, commit);
	);

  fclose (file);
}


int
main (int argc, char** argv)
{
  int c;

  while ((c = getopt (argc, argv, "hvw")) != -1)
    switch (c)
      {
      case 'h':
	print_usage ();
	break;
      case 'v':
	verbose = 1;
	break;
      case 'w':
	warnings = 1;
	break;
      default:
	exit (1);
      }

  if (optind == (argc - 1))
    validate_file (argv[optind]);
  else
    errx (1, "Missing filename.");

  exit (0);
}



From cvs at intevation.de  Sun Mar 26 11:17:15 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 26 Mar 2006 11:17:15 +0200 (CEST)
Subject: wilde: utils/admin validate-skiplist.c,1.1,1.2 
Message-ID: <20060326091715.96A2F1006A5@lists.intevation.de>

Author: wilde

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

Modified Files:
	validate-skiplist.c 
Log Message:
Added support for checking of multiple files.


Index: validate-skiplist.c
===================================================================
RCS file: /kolabrepository/utils/admin/validate-skiplist.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- validate-skiplist.c	26 Mar 2006 00:24:38 -0000	1.1
+++ validate-skiplist.c	26 Mar 2006 09:17:13 -0000	1.2
@@ -6,6 +6,7 @@
    This program is free software under the GNU GPL (>=v2)
    Read the file COPYING coming with the software for details.
    -------------------------------------------------------------------
+   $Id$
 
    This little tool does a simple syntactic evaluation on cyrus
    skiplist database files.
@@ -51,8 +52,8 @@
 void
 print_usage ()
 {
-  puts ("Usage: validate-skiplist [OPTIONS] [FILE]");
-  puts ("Validate cyrus skiplist FILE.\n");
+  puts ("Usage: validate-skiplist [OPTIONS] [FILE] ...");
+  puts ("Validate cyrus skiplist FILEs.\n");
 
   puts ("  -w  print out non fatal warnings");
   puts ("  -v  be verbose");
@@ -113,7 +114,7 @@
       ++delete;
       break;
     default:
-      errx (1, "Bad node: expected ADD or DELETE at 0x%X! (found %i)", 
+      errx (1, "Bad node: expected ADD or DELETE at 0x%X! (found 0x%X)",
 	    ftell (file), word);
     }
   commit_maybe (file);
@@ -165,9 +166,9 @@
     {
       ungetc (c, file);
       add_delete (file);
-    } 
+    }
 
-  INFO (printf ("Found %i ADD, %i DELETE and %i COMMIT nodes in log.\n",
+  INFO (printf ("Found %i ADD, %i DELETE and %i COMMIT nodes in log.\n\n",
 		add, delete, commit);
 	);
 
@@ -178,7 +179,7 @@
 int
 main (int argc, char** argv)
 {
-  int c;
+  int c, i;
 
   while ((c = getopt (argc, argv, "hvw")) != -1)
     switch (c)
@@ -196,8 +197,9 @@
 	exit (1);
       }
 
-  if (optind == (argc - 1))
-    validate_file (argv[optind]);
+  if (argc > optind)
+    for (i = optind; i < argc; i++)
+      validate_file (argv[i]);
   else
     errx (1, "Missing filename.");
 



From cvs at intevation.de  Sun Mar 26 13:08:52 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 26 Mar 2006 13:08:52 +0200 (CEST)
Subject: wilde: utils/admin validate-skiplist.c,1.2,1.3 
Message-ID: <20060326110852.9CFCA1006A5@lists.intevation.de>

Author: wilde

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

Modified Files:
	validate-skiplist.c 
Log Message:
Fixed bug: statistic count of add keys was broken.

Index: validate-skiplist.c
===================================================================
RCS file: /kolabrepository/utils/admin/validate-skiplist.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- validate-skiplist.c	26 Mar 2006 09:17:13 -0000	1.2
+++ validate-skiplist.c	26 Mar 2006 11:08:50 -0000	1.3
@@ -106,7 +106,7 @@
     {
     case ADD:
       /* FIXME: we should inspect add nodes more in depth. */
-      while (read_word (file) != 0xffffffff) /* skip till termination */
+      while (read_word (file) != 0xffffffff); /* skip till termination */
       ++add;
       break;
     case DELETE:



From cvs at intevation.de  Sun Mar 26 13:22:06 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 26 Mar 2006 13:22:06 +0200 (CEST)
Subject: wilde: utils/admin validate-skiplist.c,1.3,1.4 
Message-ID: <20060326112206.D6B511006A5@lists.intevation.de>

Author: wilde

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

Modified Files:
	validate-skiplist.c 
Log Message:
Added a bit more elaborated parsing of ADD nodes.
Added a bit nicer formated hex output in messages.
Corrected address offset in "Bad node" error message.


Index: validate-skiplist.c
===================================================================
RCS file: /kolabrepository/utils/admin/validate-skiplist.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- validate-skiplist.c	26 Mar 2006 11:08:50 -0000	1.3
+++ validate-skiplist.c	26 Mar 2006 11:22:04 -0000	1.4
@@ -28,8 +28,8 @@
 #include <unistd.h>
 #include <err.h>
 
-#define INFO(blk) if (verbose) { blk }
-#define WARN(blk) if (warnings) { blk }
+#define INFO(blk)  if (verbose) { blk }
+#define WARN(blk)  if (warnings) { blk }
 
 int verbose  = 0;
 int warnings = 0;
@@ -62,6 +62,14 @@
 }
 
 
+inline long
+align (long addr)
+{
+  if (addr % 4)
+    addr += 4 - (addr % 4);
+  return addr;
+}
+
 int32_t
 read_word (FILE *file)
 {
@@ -71,17 +79,18 @@
     {
       word = word << 8;
       if ((c = fgetc (file)) == EOF)
-	errx (1, "Unexpected end of file at 0x%X", ftell (file));
+	errx (1, "Unexpected end of file at 0x%0.8X", ftell (file));
       word += c;
     }
   return word;
 }
 
+
 void
 jump_to_position (FILE *file, long pos)
 {
   if (fseek (file, pos, SEEK_SET) == -1)
-    errx (1, "Unexpected end of file at 0x%X", ftell (file));
+    errx (1, "Unexpected end of file at 0x%0.8X", ftell (file));
 }
 
 
@@ -105,7 +114,12 @@
   switch (word)
     {
     case ADD:
-      /* FIXME: we should inspect add nodes more in depth. */
+      word = read_word (file);	/* key size */
+      word = align (word);
+      jump_to_position (file, ftell (file) + word);
+      word = read_word (file);	/* data size */
+      word = align (word);
+      jump_to_position (file, ftell (file) + word);
       while (read_word (file) != 0xffffffff); /* skip till termination */
       ++add;
       break;
@@ -114,8 +128,8 @@
       ++delete;
       break;
     default:
-      errx (1, "Bad node: expected ADD or DELETE at 0x%X! (found 0x%X)",
-	    ftell (file), word);
+      errx (1, "Bad node: expected ADD or DELETE at 0x%0.8X! (found 0x%0.8X)",
+	    ftell (file) - 4, word);
     }
   commit_maybe (file);
 }
@@ -150,7 +164,7 @@
   jump_to_position (file, 40);
   logstart = read_word (file);
 
-  INFO (printf ("Log start at 0x%X\n", logstart);
+  INFO (printf ("Log start at 0x%0.8X\n", logstart);
 	word = read_word (file);
 	printf ("Last recovery on %s\n", ctime (&word));
 	);



From cvs at intevation.de  Sun Mar 26 15:28:10 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 26 Mar 2006 15:28:10 +0200 (CEST)
Subject: richard: server/kolab-resource-handlers/kolab-resource-handlers
	ChangeLog, 1.12, 1.13 Makefile.am, 1.6, 1.7 
Message-ID: <20060326132810.AB15A1006A5@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
the build proces did not use the resmgr_scriptsdir variable,
this is now corrected



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ChangeLog	5 Feb 2006 20:10:08 -0000	1.12
+++ ChangeLog	26 Mar 2006 13:28:08 -0000	1.13
@@ -1,3 +1,7 @@
+2006-03-26 Richard Bos <richard at radoeka.nl>
+	* Makefile.am: the build proces did not use the resmgr_scriptsdir
+	  variable, this is now corrected
+
 2006-02-05 Richard Bos <richard at radoeka.nl>
 	* freebusy/freebusycache.class.php, freebusy/freebusy.class.php,
 	  resmgr/resmgr.php, resmgr/olhacks.php: removed

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.am	5 Feb 2006 20:15:10 -0000	1.6
+++ Makefile.am	26 Mar 2006 13:28:08 -0000	1.7
@@ -28,15 +28,19 @@
 
 
 conffile_FILES = $(srcdir)/freebusy/freebusy.conf \
-	resmgr/resmgr.conf \
-	resmgr/kolabfilter.php \
-	resmgr/kolabmailboxfilter.php
+	resmgr/resmgr.conf
 
 conffiledir = $(resmgr_confdir)
 conffile_DATA = $(conffile_FILES)
 EXTRA_DIST += freebusy/freebusy.conf
 
 
+resmgrscript_SCRIPTS = resmgr/kolabfilter.php \
+	resmgr/kolabmailboxfilter.php
+
+resmgrscriptdir = $(resmgr_scriptsdir)
+
+
 resmgr_FILES = resmgr/kolabmailtransport.php \
 	resmgr/misc.php
 
@@ -119,8 +123,8 @@
 install-data-hook:
 	install -d -m 755 $(DESTDIR)/$(resmgr_filterdir)
 	install -d -m 755 $(DESTDIR)/$(freebusy_cachedir)
-	chmod a+x $(DESTDIR)/$(resmgr_confdir)/kolabfilter.php
-	chmod a+x $(DESTDIR)/$(resmgr_confdir)/kolabmailboxfilter.php
+	chmod a+x $(DESTDIR)/$(resmgr_scriptsdir)/kolabfilter.php
+	chmod a+x $(DESTDIR)/$(resmgr_scriptsdir)/kolabmailboxfilter.php
 	chmod a+x $(DESTDIR)/$(phplibdir2)/$(kolab_php_module_prefix)kolabfilter/resmgr.php
 	chmod o=--- $(DESTDIR)/$(resmgr_confdir)/freebusy.conf
 	chmod o=--- $(DESTDIR)/$(resmgr_confdir)/resmgr.conf



From cvs at intevation.de  Sun Mar 26 15:28:14 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 26 Mar 2006 15:28:14 +0200 (CEST)
Subject: richard: server/kolabd/kolabd ChangeLog,1.68,1.69 
Message-ID: <20060326132814.A7DFC1006CA@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
provide the correct values for the resmgr_scriptsdir variable.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- ChangeLog	20 Mar 2006 21:09:37 -0000	1.68
+++ ChangeLog	26 Mar 2006 13:28:12 -0000	1.69
@@ -1,3 +1,7 @@
+2006-03-26 Richard Bos <richard at radoeka.nl>
+	* 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>
 	Patch committed by Richard Bos
 	* dist_conf/common, dist_conf/kolab, dist_conf/suse,



From cvs at intevation.de  Sun Mar 26 15:28:14 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 26 Mar 2006 15:28:14 +0200 (CEST)
Subject: richard: server/kolabd/kolabd/dist_conf kolab, 1.34, 1.35 suse, 1.46,
	1.47 
Message-ID: <20060326132814.BCB611006CB@lists.intevation.de>

Author: richard

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

Modified Files:
	kolab suse 
Log Message:
provide the correct values for the resmgr_scriptsdir variable.



Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- kolab	20 Mar 2006 21:06:50 -0000	1.34
+++ kolab	26 Mar 2006 13:28:12 -0000	1.35
@@ -117,7 +117,7 @@
 kolab_smtpdpolicy_conffile_usr=${kolab_musr}
 kolab_smtpdpolicy_conffile_grp=${kolab_grp}
 kolab_php_module_prefix=
-kolab_scriptsdir=$(sysconfdir)/kolab
+kolab_scriptsdir=$(sysconfdir)/resmgr
 kolab_php_smarty_prefix=Smarty
 
 ldapserver_statedir=${localstatedir}/openldap

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- suse	21 Mar 2006 19:52:25 -0000	1.46
+++ suse	26 Mar 2006 13:28:12 -0000	1.47
@@ -153,7 +153,7 @@
 resmgr_conffile_usr=kolab
 resmgr_conffile_grp=root
 resmgr_filterdir=${localstatedir}/resmgr/filter
-resmgr_scriptsdir=$(datadir)/kolab/scripts/resmgr
+resmgr_scriptsdir=${kolab_scriptsdir}/resmgr
 resmgr_usr=root
 resmgr_grp=root
 



From cvs at intevation.de  Sun Mar 26 15:45:25 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 26 Mar 2006 15:45:25 +0200 (CEST)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog,1.22,1.23 
Message-ID: <20060326134525.E83811006A5@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
make the Smarty prefix configurable, using variable: kolab_php_smarty_prefix



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- ChangeLog	22 Mar 2006 19:34:28 -0000	1.22
+++ ChangeLog	26 Mar 2006 13:45:23 -0000	1.23
@@ -1,3 +1,8 @@
+2006-03-26 Richard Bos <richard at radoeka.nl>
+	Patch from Gunnar Wrobel
+	* php/admin/include/mysmarty.php.in: make the Smarty prefix
+	  configurable, using variable: kolab_php_smarty_prefix
+
 2006-03-22 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos
 	* www/admin/user/user.php.in: replaced $kolab_prefix/etc by



From cvs at intevation.de  Sun Mar 26 15:45:25 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 26 Mar 2006 15:45:25 +0200 (CEST)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/include
	mysmarty.php.in, 1.7, 1.8 
Message-ID: <20060326134525.ED1B11006C6@lists.intevation.de>

Author: richard

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

Modified Files:
	mysmarty.php.in 
Log Message:
make the Smarty prefix configurable, using variable: kolab_php_smarty_prefix



Index: mysmarty.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/mysmarty.php.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- mysmarty.php.in	5 Feb 2006 20:13:55 -0000	1.7
+++ mysmarty.php.in	26 Mar 2006 13:45:23 -0000	1.8
@@ -19,7 +19,7 @@
  */
 
 require_once('config.php');
-require_once('Smarty/Smarty.class.php');
+require_once('@kolab_php_smarty_prefix@/Smarty.class.php');
 require_once('locale.php');
 
 // PENDING: Remove this before production(!)



From cvs at intevation.de  Sun Mar 26 16:12:55 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 26 Mar 2006 16:12:55 +0200 (CEST)
Subject: wilde: utils/admin validate-skiplist.c,1.4,1.5 
Message-ID: <20060326141255.729271006C6@lists.intevation.de>

Author: wilde

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

Modified Files:
	validate-skiplist.c 
Log Message:
Bug Fix: correct handling of files where last node is not COMMIT.
Beautified warning messages.


Index: validate-skiplist.c
===================================================================
RCS file: /kolabrepository/utils/admin/validate-skiplist.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- validate-skiplist.c	26 Mar 2006 11:22:04 -0000	1.4
+++ validate-skiplist.c	26 Mar 2006 14:12:53 -0000	1.5
@@ -70,6 +70,15 @@
   return addr;
 }
 
+inline int
+peek (FILE *file)
+{
+  int c;
+  if ((c = getc (file)) != EOF)
+    ungetc (c, file);
+  return c;
+}
+
 int32_t
 read_word (FILE *file)
 {
@@ -97,12 +106,13 @@
 void
 commit_maybe (FILE *file)
 {
-  if (read_word (file) == COMMIT)
-    {
+  if (peek (file) != EOF)
+    if (read_word (file) == COMMIT)
       ++commit;
-    }
+    else
+      fseek (file, -4, SEEK_CUR);
   else
-    fseek (file, -4, SEEK_CUR);
+    WARN (puts ("Warning: Last skipnode is not COMMIT"););
 }
 
 
@@ -138,7 +148,7 @@
 void
 validate_file (char* filename)
 {
-  int i,c;
+  int i;
   int32_t word;
   long logstart;
   FILE *file;
@@ -150,7 +160,7 @@
 
   WARN (word = read_word (file); /* magic number */
 	if (word != MAGICNUM)
-	  printf ("Strange magic number %X expected %X\n", word, MAGICNUM);
+	  printf ("Warning: Strange magic number %X expected %X\n", word, MAGICNUM);
 	);
 
   INFO (jump_to_position (file, 20); /* jump to version numbers */
@@ -176,11 +186,8 @@
   jump_to_position (file, logstart);
   INFO (puts ("Checking log part..."););
 
-  while ((c = getc (file)) != EOF)
-    {
-      ungetc (c, file);
-      add_delete (file);
-    }
+  while (peek (file) != EOF)
+    add_delete (file);
 
   INFO (printf ("Found %i ADD, %i DELETE and %i COMMIT nodes in log.\n\n",
 		add, delete, commit);



From cvs at intevation.de  Sun Mar 26 17:10:23 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 26 Mar 2006 17:10:23 +0200 (CEST)
Subject: wilde: utils/admin validate-skiplist.c,1.5,1.6 
Message-ID: <20060326151023.7E7F81006B0@lists.intevation.de>

Author: wilde

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

Modified Files:
	validate-skiplist.c 
Log Message:
Removed the byte order warning comment.  (Tested on SUN Sparc/NetBSD)


Index: validate-skiplist.c
===================================================================
RCS file: /kolabrepository/utils/admin/validate-skiplist.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- validate-skiplist.c	26 Mar 2006 14:12:53 -0000	1.5
+++ validate-skiplist.c	26 Mar 2006 15:10:21 -0000	1.6
@@ -14,11 +14,6 @@
    It does no semantic checking, no log replay, and _no_ locking (so
    don't use it on files used by a running system.)
 
-   WARNING:
-
-   This is only tested on little endian systems and will most likely
-   break on big endian machines!
-
 */
 
 #include <ctype.h>



From cvs at intevation.de  Sun Mar 26 17:30:32 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 26 Mar 2006 17:30:32 +0200 (CEST)
Subject: wilde: utils/admin validate-skiplist.c,1.6,1.7 
Message-ID: <20060326153032.A45041006CA@lists.intevation.de>

Author: wilde

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

Modified Files:
	validate-skiplist.c 
Log Message:
Added option -V to obtain version information.


Index: validate-skiplist.c
===================================================================
RCS file: /kolabrepository/utils/admin/validate-skiplist.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- validate-skiplist.c	26 Mar 2006 15:10:21 -0000	1.6
+++ validate-skiplist.c	26 Mar 2006 15:30:30 -0000	1.7
@@ -16,6 +16,9 @@
 
 */
 
+#define MAJOR_VERSION 0
+#define MINOR_VERSION 2
+
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -53,6 +56,17 @@
   puts ("  -w  print out non fatal warnings");
   puts ("  -v  be verbose");
   puts ("  -h  print this help message and exit");
+  puts ("  -V  print version info and exit");
+  exit (0);
+}
+
+void
+print_version ()
+{
+  printf ("validate-skiplist %i.%i\n\n", MAJOR_VERSION, MINOR_VERSION);
+  puts ("Copyright (C) 2006 by Sascha Wilde <wilde at sha-bang.de>");
+  puts ("This is free software; see the source for copying conditions.  There is NO");
+  puts ("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ");
   exit (0);
 }
 
@@ -197,11 +211,14 @@
 {
   int c, i;
 
-  while ((c = getopt (argc, argv, "hvw")) != -1)
+  while ((c = getopt (argc, argv, "hVvw")) != -1)
     switch (c)
       {
       case 'h':
 	print_usage ();
+	break;
+      case 'V':
+	print_version ();
 	break;
       case 'v':
 	verbose = 1;



From cvs at intevation.de  Sun Mar 26 19:58:55 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 26 Mar 2006 19:58:55 +0200 (CEST)
Subject: richard: server/kolabd/kolabd/dist_conf kolab,1.35,1.36 
Message-ID: <20060326175855.0FE251006B0@lists.intevation.de>

Author: richard

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

Modified Files:
	kolab 
Log Message:
kolab scripts must be installed in /kolab/etc/kolab

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- kolab	26 Mar 2006 13:28:12 -0000	1.35
+++ kolab	26 Mar 2006 17:58:53 -0000	1.36
@@ -117,7 +117,7 @@
 kolab_smtpdpolicy_conffile_usr=${kolab_musr}
 kolab_smtpdpolicy_conffile_grp=${kolab_grp}
 kolab_php_module_prefix=
-kolab_scriptsdir=$(sysconfdir)/resmgr
+kolab_scriptsdir=$(sysconfdir)/kolab
 kolab_php_smarty_prefix=Smarty
 
 ldapserver_statedir=${localstatedir}/openldap



From cvs at intevation.de  Sun Mar 26 20:47:04 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 26 Mar 2006 20:47:04 +0200 (CEST)
Subject: richard: server/kolabd/kolabd ChangeLog,1.69,1.70 
Message-ID: <20060326184704.CB6201005D4@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
Introduced new variable @aliases_file@



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- ChangeLog	26 Mar 2006 13:28:12 -0000	1.69
+++ ChangeLog	26 Mar 2006 18:47:02 -0000	1.70
@@ -1,3 +1,8 @@
+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@
+
 2006-03-26 Richard Bos <richard at radoeka.nl>
 	* dist_conf/suse, dist_conf/kolab provide the correct values for
 	  the resmgr_scriptsdir variable.



From cvs at intevation.de  Sun Mar 26 20:47:04 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 26 Mar 2006 20:47:04 +0200 (CEST)
Subject: richard: server/kolabd/kolabd/templates main.cf.template.in,1.8,1.9 
Message-ID: <20060326184704.D67091006A3@lists.intevation.de>

Author: richard

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

Modified Files:
	main.cf.template.in 
Log Message:
Introduced new variable @aliases_file@



Index: main.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- main.cf.template.in	18 Jan 2006 19:43:11 -0000	1.8
+++ main.cf.template.in	26 Mar 2006 18:47:02 -0000	1.9
@@ -68,8 +68,8 @@
 	ldap:@emailserver_confdir@/ldapvirtual.cf
 relocated_maps = hash:@emailserver_confdir@/relocated
 transport_maps = hash:@emailserver_confdir@/transport, ldap:@emailserver_confdir@/ldaptransport.cf
-alias_maps = hash:@emailserver_confdir@/aliases
-alias_database = hash:@emailserver_confdir@/aliases
+alias_maps = hash:@aliases_file@
+alias_database = hash:@aliases_file@
 #virtual_mailbox_maps = $virtual_maps
 local_recipient_maps = $virtual_maps, $alias_maps
 



From cvs at intevation.de  Sun Mar 26 20:47:04 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 26 Mar 2006 20:47:04 +0200 (CEST)
Subject: richard: server/kolabd/kolabd/dist_conf common, 1.28, 1.29 kolab, 1.36,
	1.37 suse, 1.47, 1.48 
Message-ID: <20060326184704.DB5351006B0@lists.intevation.de>

Author: richard

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

Modified Files:
	common kolab suse 
Log Message:
Introduced new variable @aliases_file@



Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- common	20 Mar 2006 21:06:50 -0000	1.28
+++ common	26 Mar 2006 18:47:02 -0000	1.29
@@ -20,6 +20,7 @@
 	-e 's,[@]RPM[@],$(RPM),g' \
 	-e 's,[@]VERSION[@],$(VERSION),g' \
 	-e 's,[@]WITHOPENPKG[@],$(WITHOPENPKG),g' \
+	-e 's,[@]aliases_file[@],$(aliases_file),g' \
 	-e 's,[@]amavisd_conffile[@],$(amavisd_conffile),g' \
 	-e 's,[@]amavisd_grp[@],$(amavisd_grp),g' \
 	-e 's,[@]amavisd_home[@],$(amavisd_home),g' \

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- kolab	26 Mar 2006 17:58:53 -0000	1.36
+++ kolab	26 Mar 2006 18:47:02 -0000	1.37
@@ -190,3 +190,5 @@
 backupdir=${sysconfdir}/kolab
 
 pki_grp=${kolab_rgrp}
+
+aliases_file=${emailserver_confdir}/aliases

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- suse	26 Mar 2006 13:28:12 -0000	1.47
+++ suse	26 Mar 2006 18:47:02 -0000	1.48
@@ -168,6 +168,8 @@
 
 pki_grp=pki
 
+aliases_file=${sysconfdir}/aliases
+
 # One time backup files.  These original distribution configuration files
 # will be backed up once, just before kolab is about to change those files.
 backupfiles=/etc/amavisd.conf \



From cvs at intevation.de  Sun Mar 26 23:25:55 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 26 Mar 2006 23:25:55 +0200 (CEST)
Subject: martin: server/kolabd/kolabd kolab2.schema,1.16,1.17 
Message-ID: <20060326212555.DE0991006A3@lists.intevation.de>

Author: martin

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

Modified Files:
	kolab2.schema 
Log Message:
Martin Konold: Added kolabFolderType and improved some documentation. kolabFolderType is currently mainly used for shared folders


Index: kolab2.schema
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab2.schema,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- kolab2.schema	27 Dec 2005 13:04:53 -0000	1.16
+++ kolab2.schema	26 Mar 2006 21:25:53 -0000	1.17
@@ -1,6 +1,6 @@
 # $Id$
 # (c) 2003, 2004 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
-# (c) 2003-2005  Martin Konold <martin.konold at erfrakon.de>
+# (c) 2003-2006  Martin Konold <martin.konold at erfrakon.de>
 # (c) 2003 Achim Frank <achim.frank at erfrakon.de>
 #
 # Redistribution and use in source and binary forms, with or without 
@@ -32,10 +32,11 @@
 # as provided by 3rd parties like OpenLDAP.
 #
 # slapd.conf then looks like
-#  include /kolab/etc/openldap/schema/core.schema
-#  include /kolab/etc/openldap/schema/cosine.schema
-#  include /kolab/local/etc/openldap/schema/inetorgperson.schema
-#  include /kolab/local/etc/openldap/schema/kolab2.schema
+# include /kolab/etc/openldap/schema/core.schema
+# include /kolab/etc/openldap/schema/cosine.schema
+# include /kolab/etc/openldap/schema/inetorgperson.schema
+# include /kolab/etc/openldap/schema/rfc2739.schema
+# include /kolab/etc/openldap/schema/kolab2.schema
 
 #
 ####################
@@ -87,7 +88,7 @@
   SUBSTR caseIgnoreIA5SubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
-# fqdn of all hosts in a multi-location setup
+# fqdn of all hosts in a multi-location or cluster setup
 attributetype ( 1.3.6.1.4.1.19414.2.1.6
   NAME 'kolabHost'
   DESC 'Multivalued -- list of hostnames in a Kolab setup'
@@ -95,7 +96,7 @@
   SUBSTR caseIgnoreIA5SubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
-# fqdn of the server containg the actual user data
+# fqdn of the server containg the actual user mailbox
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.1
   NAME 'kolabHomeServer'
   DESC 'server which keeps the users mailbox'
@@ -135,7 +136,7 @@
 # user at domain.tld: ACT_ALWAYS_ACCEPT
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.4
   NAME ( 'kolabInvitationPolicy' 'kolabResourceAction' )
-  DESC 'Used by user, group and resource accounts to determine how to respond to invitations'
+  DESC 'defines how to respond to invitations'
   EQUALITY caseIgnoreIA5Match
   SUBSTR caseIgnoreIA5SubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
@@ -293,6 +294,29 @@
   SUBSTR caseIgnoreSubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1024} )
 
+# kolabFolderType describes the kind of Kolab folder
+# as defined in the kolab format specification. 
+# We will annotate all folders with an entry 
+# /vendor/kolab/folder-type containing the attribute 
+# value.shared set to: <type>[.<subtype>]. 
+# The <type> can be: mail, event, journal, task, note, 
+# or contact. The <subtype> for a mail folder can be 
+# inbox, drafts, sentitems, or junkemail (this one holds 
+# spam mails). For the other <type>s, it can only be 
+# default, or not set.  For other types of folders 
+# supported by the clients, these should be prefixed with 
+# "k-" for KMail, "h-" for Horde and "o-" for Outlook, and 
+# look like for example "kolab.o-voicemail". Other third-party
+# clients shall use the "x-" prefix.
+# We then use the ANNOTATEMORE IMAP extension to 
+# associate the folder type with a folder.
+attributetype ( 1.3.6.1.4.1.19414.2.1.7
+  NAME 'kolabFolderType'
+  DESC 'type of a kolab folder'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+
 ######################
 # postfix attributes #
 ######################
@@ -529,7 +553,8 @@
         userPassword ) )
 
 # shared folders are typically visible to everyone subscribed to 
-# the server without the need for an extra login
+# the server without the need for an extra login. Subfolders are
+# defined using the hiarchy seperator '/' e.g. "sf/sub1".
 objectclass ( 1.3.6.1.4.1.19414.2.2.9 
   NAME 'kolabSharedFolder'
   DESC 'Kolab public shared folder'
@@ -539,11 +564,14 @@
         alias $
         cyrus-userquota $
         kolabHomeServer $
+        kolabFolderType $
         kolabDeleteflag ) )
 
-# used as a plain node for the LDAP tree. In contrast to unix filesystem directories
-# LDAP nodes can and often do also have contents/attributes. We use kolabNamedObject
-# in order to put more structure in the directory tree.
+# kolabNamedObject is used as a plain node for the LDAP tree. 
+# In contrast to unix filesystem directories LDAP nodes can 
+# and often do also have contents/attributes. We use the 
+# kolabNamedObject in order to put some structure in the 
+# LDAP directory tree.
 objectclass ( 1.3.6.1.4.1.5322.13.1.1 
   NAME 'kolabNamedObject'
   SUP top STRUCTURAL
@@ -602,10 +630,13 @@
         kolabDeleteflag $
         alias ) )
 
-# kolab groupOfNames with extra kolabDeleteflag and the required attribute mail.    
-# The mail attribute for kolab objects of the type kolabGroupOfNames is not arbitrary but    
-# MUST be a single attribute of the form cn at kolabdomain (e.g. employees at mydomain.com). The    
-# mail attribute MUST be worldwide unique.    
+# kolab groupOfNames with extra kolabDeleteflag and the required 
+# attribute mail.    
+# The mail attribute for kolab objects of the type kolabGroupOfNames 
+# is not arbitrary but MUST be a single attribute of the form 
+# of an valid SMTP address with the CN as the local part.
+# E.g cn at kolabdomain (e.g. employees at mydomain.com). The    
+# mail attribute MUST be globally unique.    
 objectclass ( 1.3.6.1.4.1.19414.3.2.5    
   NAME 'kolabGroupOfNames'    
   DESC 'Kolab group of names (DNs) derived from RFC2256'    



From cvs at intevation.de  Sun Mar 26 23:55:32 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun, 26 Mar 2006 23:55:32 +0200 (CEST)
Subject: martin: server/perl-kolab/Kolab-Cyrus Cyrus.pm,1.7,1.8 
Message-ID: <20060326215532.703F01006B0@lists.intevation.de>

Author: martin

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

Modified Files:
	Cyrus.pm 
Log Message:
Martin Konold: Integrated patch from Tobias Koenig


Index: Cyrus.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-Cyrus/Cyrus.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Cyrus.pm	8 Jun 2005 12:44:35 -0000	1.7
+++ Cyrus.pm	26 Mar 2006 21:55:30 -0000	1.8
@@ -3,7 +3,7 @@
 ##
 ##  Copyright (c) 2003  Code Fusion cc
 ##
-##    Writen by Stuart Bing� <s.binge at codefusion.co.za>
+##    Written by Stuart Bing� <s.binge at codefusion.co.za>
 ##
 ##  This  program is free  software; you can redistribute  it and/or
 ##  modify it  under the terms of the GNU  General Public License as
@@ -181,6 +181,18 @@
         }
     }
     Kolab::log('Y', "Finished modifying ACL of $cyruid", KOLAB_DEBUG);
+}
+
+sub setFolderType {
+  my $cyrus = shift;
+  my $uid = shift;
+  my $sf = shift || 0;
+  my $foldertype = shift || 'mail';
+  my $cyruid = &createUid($uid, $sf);
+    
+  if (!$cyrus->mboxconfig($cyruid, '/vendor/kolab/folder-type', $foldertype)) {
+    Kolab::log('Y', "Unable to set the folder type for mailbox `$cyruid' to `$foldertype', Error = `" . $cyrus->error . "'", KOLAB_WARN);
+  }
 }
 
 1;



From cvs at intevation.de  Mon Mar 27 00:39:03 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon, 27 Mar 2006 00:39:03 +0200 (CEST)
Subject: martin: server/kolabd/kolabd kolab2.schema,1.17,1.18 
Message-ID: <20060326223903.662441006C6@lists.intevation.de>

Author: martin

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

Modified Files:
	kolab2.schema 
Log Message:
Martin Konold: Better make it explicit that a folder can only have a single foldertype


Index: kolab2.schema
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab2.schema,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- kolab2.schema	26 Mar 2006 21:25:53 -0000	1.17
+++ kolab2.schema	26 Mar 2006 22:39:01 -0000	1.18
@@ -315,7 +315,8 @@
   DESC 'type of a kolab folder'
   EQUALITY caseIgnoreIA5Match
   SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
+  SINGLE-VALUE )
 
 ######################
 # postfix attributes #



From cvs at intevation.de  Mon Mar 27 23:07:56 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon, 27 Mar 2006 23:07:56 +0200 (CEST)
Subject: richard: server/perl-kolab/Kolab-Conf Conf.pm.in,1.5,1.6 
Message-ID: <20060327210756.A57621005BC@lists.intevation.de>

Author: richard

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

Modified Files:
	Conf.pm.in 
Log Message:
Finish the partial commit done on 20 Mar 2006 21:09:07
The impact is minimal as only the comments have changed.



Index: Conf.pm.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Conf.pm.in	22 Feb 2006 21:28:42 -0000	1.5
+++ Conf.pm.in	27 Mar 2006 21:07:54 -0000	1.6
@@ -81,7 +81,7 @@
 # 		 "$templatedir/session_vars.php.template" => "@phplibdir2@/admin/include/session_vars.php",
 # 		 "$templatedir/clamd.conf.template" => "@clamav_confdir@/clamd.conf",
 # 		 "$templatedir/freshclam.conf.template" => "@clamav_confdir@/freshclam.conf",
-# 		 "$templatedir/amavisd.conf.template" => "@amavisd_confdir@/amavisd.conf",
+# 		 "$templatedir/amavisd.conf.template" => "@amavisd_conffile@",
 # 		 "$templatedir/main.cf.template" => "@emailserver_confdir@/main.cf@",
 # 		 "$templatedir/ldapdistlist.cf.template" => "@emailserver_confdir@/ldapdistlist.cf",
 # 		 "$templatedir/ldaptransport.cf.template" => "@emailserver_confdir@/ldaptransport.cf",
@@ -95,7 +95,7 @@
 # 		 "$templatedir/cyrus.conf.template" => "@imap_confdir@/cyrus.conf",
 # 		 "$templatedir/httpd.conf.template" => "@webserver_confdir@/apache.conf",
 # 		 "$templatedir/httpd.local.template" => "@webserver_confdir@/apache.local",
-# 		 "$templatedir/php.ini.template" => "@webserver_confdir@/php.ini",
+# 		 "$templatedir/php.ini.template" => "@phpini_dir@/php.ini",
 # 		 "$templatedir/proftpd.conf.template" => "@ftpserver_confdir@/proftpd.conf",
 # 		 "$templatedir/ldap.conf.template" => "@sysconfdir@/openldap/ldap.conf",
 # 		 "$templatedir/slapd.conf.template" => "@sysconfdir@/openldap/slapd.conf",
@@ -125,7 +125,7 @@
 # 		   "@imap_confdir@/imapd.conf"                             => oct('@imap_confperm@'),
 # 		   "@webserver_confdir@/apache.conf"                       => 0640,
 # 		   "@webserver_confdir@/apache.local"                      => 0640,
-# 		   "@webserver_confdir@/php.ini"                           => 0640,
+# 		   "@phpini_dir@/php.ini"  		                          => 0640,
 # 		   "@ftpserver_confdir@/proftpd.conf"                      => 0640,
 # 		   "@sysconfdir@/openldap/slapd.conf"                      => 0640,
 # 		   "@sysconfdir@/openldap/slapd.access"                    => 0640,
@@ -150,12 +150,12 @@
 # 		 "@emailserver_confdir@/master.cf"                        => "@emailserver_usr@:@emailserver_grp@",
 # 		 "@clamav_confdir@/clamd.conf"                           => "kolab:kolab-r",
 # 		 "@clamav_confdir@/freshclam.conf"                       => "kolab:kolab-r",
-# 		 "@amavisd_confdir@/amavisd.conf"                        => "kolab:kolab-r",
+# 		 "@amavisd_conffile@"                                    => "kolab:kolab-r",
 # 		 "@sasl_authdconffile@"                                  => "kolab:kolab",
 # 		 "@imap_confdir@/imapd.conf"                             => "@imap_usr@:@imap_grp@",
 # 		 "@webserver_confdir@/apache.conf"                       => "kolab:kolab-n",
 # 		 "@webserver_confdir@/apache.local"                      => "kolab:kolab-n",
-# 		 "@webserver_confdir@/php.ini"                           => "kolab:kolab-n",
+# 		 "@phpini_dir/php.ini"                        			   => "kolab:kolab-n",
 # 		 "@ftpserver_confdir@/proftpd.conf"                      => "kolab:kolab-n",
 # 		 "@sysconfdir@/openldap/ldap.conf"                       => "@ldapserver_usr@:@ldapserver_grp@",
 # 		 "@sysconfdir@/openldap/slapd.conf"                      => "@ldapserver_usr@:@ldapserver_grp@",



From cvs at intevation.de  Tue Mar 28 20:50:41 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 28 Mar 2006 20:50:41 +0200 (CEST)
Subject: richard: server/kolabd/kolabd ChangeLog,1.70,1.71 
Message-ID: <20060328185041.79B5A100161@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
use the variable phpini_dir instead of webserver_confdir



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- ChangeLog	26 Mar 2006 18:47:02 -0000	1.70
+++ ChangeLog	28 Mar 2006 18:50:39 -0000	1.71
@@ -1,3 +1,7 @@
+2006-03-26 Richard Bos <richard at radoeka.nl>
+	* 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>
 	Patch committed by Richard Bos
 	* dist_conf/{common,suse,kolab}, templates/main.cf.template.in:



From cvs at intevation.de  Tue Mar 28 20:50:41 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 28 Mar 2006 20:50:41 +0200 (CEST)
Subject: richard: server/kolabd/kolabd/templates php.ini.template.in,1.3,1.4 
Message-ID: <20060328185041.7DD4E1006A4@lists.intevation.de>

Author: richard

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

Modified Files:
	php.ini.template.in 
Log Message:
use the variable phpini_dir instead of webserver_confdir



Index: php.ini.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/php.ini.template.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- php.ini.template.in	22 Dec 2005 22:33:08 -0000	1.3
+++ php.ini.template.in	28 Mar 2006 18:50:39 -0000	1.4
@@ -1,5 +1,5 @@
 KOLAB_META_START
-TARGET=@webserver_confdir@/php.ini
+TARGET=@phpini_dir@/php.ini
 PERMISSIONS=0640
 OWNERSHIP=@webserver_musr@:@webserver_grp@
 KOLAB_META_END



From cvs at intevation.de  Tue Mar 28 20:53:43 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 28 Mar 2006 20:53:43 +0200 (CEST)
Subject: richard: server/kolab-resource-handlers/kolab-resource-handlers
	ChangeLog, 1.13, 1.14 Makefile.am, 1.7, 1.8 
Message-ID: <20060328185343.4CF781006A4@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
suggestion from Gunnar Wrobel <wrobel at gentoo.org>:
The chmod lines for kolabfilter.php and kolabmailboxfilter.php are
not really necessary since both files are being installed as
"script" so they are marked executable automatically.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ChangeLog	26 Mar 2006 13:28:08 -0000	1.13
+++ ChangeLog	28 Mar 2006 18:53:41 -0000	1.14
@@ -1,3 +1,9 @@
+2006-03-28 Richard Bos <richard at radoeka.nl>
+	* Makefile.am: suggestion from Gunnar Wrobel <wrobel at gentoo.org>:
+	  The chmod lines for kolabfilter.php and kolabmailboxfilter.php are
+	  not really necessary since both files are being installed as
+	  "script" so they are marked executable automatically.
+
 2006-03-26 Richard Bos <richard at radoeka.nl>
 	* Makefile.am: the build proces did not use the resmgr_scriptsdir
 	  variable, this is now corrected

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.am	26 Mar 2006 13:28:08 -0000	1.7
+++ Makefile.am	28 Mar 2006 18:53:41 -0000	1.8
@@ -123,8 +123,6 @@
 install-data-hook:
 	install -d -m 755 $(DESTDIR)/$(resmgr_filterdir)
 	install -d -m 755 $(DESTDIR)/$(freebusy_cachedir)
-	chmod a+x $(DESTDIR)/$(resmgr_scriptsdir)/kolabfilter.php
-	chmod a+x $(DESTDIR)/$(resmgr_scriptsdir)/kolabmailboxfilter.php
 	chmod a+x $(DESTDIR)/$(phplibdir2)/$(kolab_php_module_prefix)kolabfilter/resmgr.php
 	chmod o=--- $(DESTDIR)/$(resmgr_confdir)/freebusy.conf
 	chmod o=--- $(DESTDIR)/$(resmgr_confdir)/resmgr.conf



From cvs at intevation.de  Tue Mar 28 21:45:41 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 28 Mar 2006 21:45:41 +0200 (CEST)
Subject: richard: server/kolab-resource-handlers/kolab-resource-handlers
	ChangeLog, 1.14, 1.15 
Message-ID: <20060328194541.97DBB1006AC@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
Add missing prefix 'kolab_php_module_prefix'



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ChangeLog	28 Mar 2006 18:53:41 -0000	1.14
+++ ChangeLog	28 Mar 2006 19:45:39 -0000	1.15
@@ -1,4 +1,5 @@
 2006-03-28 Richard Bos <richard at radoeka.nl>
+	* freebusy/pfb.php.in: Add missing prefix 'kolab_php_module_prefix'
 	* Makefile.am: suggestion from Gunnar Wrobel <wrobel at gentoo.org>:
 	  The chmod lines for kolabfilter.php and kolabmailboxfilter.php are
 	  not really necessary since both files are being installed as



From cvs at intevation.de  Tue Mar 28 21:45:41 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue, 28 Mar 2006 21:45:41 +0200 (CEST)
Subject: richard: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
	pfb.php.in, 1.3, 1.4 
Message-ID: <20060328194541.A1B301006B3@lists.intevation.de>

Author: richard

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

Modified Files:
	pfb.php.in 
Log Message:
Add missing prefix 'kolab_php_module_prefix'



Index: pfb.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/pfb.php.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pfb.php.in	5 Feb 2006 20:15:10 -0000	1.3
+++ pfb.php.in	28 Mar 2006 19:45:39 -0000	1.4
@@ -134,7 +134,7 @@
     // Here we really need an authenticated user!
     unauthorized("Please authenticate");
   }
-  require_once('freebusy/freebusy.class.php');
+  require_once('@kolab_php_module_prefix at freebusy/freebusy.class.php');
 
   if( empty($owner) ) {
     notFound( _('No such account ').htmlentities($folder[0]));



From cvs at intevation.de  Wed Mar 29 12:52:16 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 29 Mar 2006 12:52:16 +0200 (CEST)
Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include
	form.class.php, 1.24, 1.25 
Message-ID: <20060329105216.B6E441005A5@lists.intevation.de>

Author: steffen

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

Modified Files:
	form.class.php 
Log Message:
Fix for issue848 + some cleanup

Index: form.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/form.class.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- form.class.php	22 Feb 2006 00:36:27 -0000	1.24
+++ form.class.php	29 Mar 2006 10:52:14 -0000	1.25
@@ -89,7 +89,12 @@
 	  case 'email':
 		$str .= '<tr>';
 		$str .= '<td>'.$value['name'].'</td>';
-		list($uname,$domain) = split('@',$value['value']);
+		if( strpos($value['value'],'@')===false ) {
+		  $uname = $value['value'];
+		  $domain = '';
+		} else {
+		  list($uname,$domain) = split('@',$value['value']);
+		}
 		if( ereg( 'readonly', $value['attrs'] ) ) {
 		  $str .= '<td><p class="ctrl">'.MySmarty::htmlentities($value['value']).'</p><input name="user_'.$key.'" type="hidden" value="'.
 			MySmarty::htmlentities($uname).'" /><input name="domain_'.$key.'" type="hidden" value="'.
@@ -291,7 +296,7 @@
 		foreach( $va as $v ) {
 		  //print "validating using $v <br/>";
 		  if( $v == 'notempty' ) {
-			debug("checking nonemptiness of $key: ".$_REQUEST[$key]." len=".strlen(trim($_REQUEST[$key])));
+			debug("checking nonemptiness of $key: ".KolabForm::getRequestVar($key)." len=".strlen(trim(KolabForm::getRequestVar($key))));
 			if( $value['type'] == 'aclselect' ) {
 			  // ignore
 			} else if( $value['type'] == 'email' ) {
@@ -367,6 +372,13 @@
       }
     }    
   }
+
+  /* static */ function getRequestVar($var, $default = false)
+  {
+	if( isset($_REQUEST[$var]) ) return $_REQUEST[$var];
+	else return $default;
+  }
+
 
   var $name;
   var $template;



From cvs at intevation.de  Wed Mar 29 12:52:16 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 29 Mar 2006 12:52:16 +0200 (CEST)
Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/addressbook
	addr.php.in, 1.3, 1.4 index.php.in, 1.1, 1.2 
Message-ID: <20060329105216.BCA5A1005D3@lists.intevation.de>

Author: steffen

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

Modified Files:
	addr.php.in index.php.in 
Log Message:
Fix for issue848 + some cleanup

Index: addr.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook/addr.php.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- addr.php.in	9 Mar 2006 21:27:22 -0000	1.3
+++ addr.php.in	29 Mar 2006 10:52:14 -0000	1.4
@@ -188,20 +188,33 @@
 			else $newdn = $dn;
 			debug("action=save, dn=$dn, newdn=$newdn<br/>\n");
 			if (strcmp($dn,$newdn) != 0) {
-			  if (($result=ldap_read($ldap->connection,$dn,"(objectclass=*)")) &&
-				  ($entry=ldap_first_entry($ldap->connection,$result)) &&
-				  ($oldattrs=ldap_get_attributes($ldap->connection,$entry))) {
-				foreach( $ldap_object as $k => $v ) if( $v == array() ) unset( $ldap_object[$k] );
-				if (!ldap_add($ldap->connection,$newdn, $ldap_object) || !ldap_delete($ldap->connection,$dn)) {
-				  array_push($errors, sprintf(_("LDAP Error: could not rename %s to %s: %s"), $dn,
-											  $newdn, ldap_error($ldap->connection)));
+			  // Check for distribution lists with this entry as member
+			  $ldap->search( $_SESSION['base_dn'], 
+							 '(&(objectClass=kolabGroupOfNames)(!(kolabDeleteFlag=*))(member='.$ldap->escape($dn).'))',
+							 array( 'dn', 'mail' ) );
+			  $distlists = $ldap->getEntries();
+			  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 );
+			  }
+			  
+			  if( !$errors ) {
+				if (($result=ldap_read($ldap->connection,$dn,"(objectclass=*)")) &&
+					($entry=ldap_first_entry($ldap->connection,$result)) &&
+					($oldattrs=ldap_get_attributes($ldap->connection,$entry))) {
+				  foreach( $ldap_object as $k => $v ) if( $v == array() ) unset( $ldap_object[$k] );
+				  if (!ldap_add($ldap->connection,$newdn, $ldap_object) || !ldap_delete($ldap->connection,$dn)) {
+					array_push($errors, sprintf(_("LDAP Error: could not rename %s to %s: %s"), $dn,
+												$newdn, ldap_error($ldap->connection)));
+				  } else {
+					$messages[] = sprintf( _("%s successfully updated"), $newdn);
+				  }
+				  $dn = $newdn;
 				} else {
-				  $messages[] = sprintf( _("%s successfully updated"), $newdn);
+				  array_push($errors,sprintf(_("LDAP Error: could not read %s: %s"), $dn,
+											 ldap_error($ldap->connection)));
 				}
-				$dn = $newdn;
-			  } else {
-				array_push($errors,sprintf(_("LDAP Error: could not read %s: %s"), $dn,
-										   ldap_error($ldap->connection)));
 			  }
 			} else {
 			  if (!ldap_modify($ldap->connection, $dn, $ldap_object)) {

Index: index.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook/index.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- index.php.in	5 Feb 2006 20:13:55 -0000	1.1
+++ index.php.in	29 Mar 2006 10:52:14 -0000	1.2
@@ -1,6 +1,6 @@
 <?php
 /*
- (c) 2004 Klar〓dalens Datakonsult AB
+ (c) 2004 Klaraedalens Datakonsult AB
  (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
  (c) 2003 Martin Konold <martin.konold at erfrakon.de>
  This program is Free Software under the GNU General Public License (>=v2).
@@ -11,6 +11,7 @@
 require_once('@kolab_php_module_prefix at admin/include/headers.php');
 require_once('@kolab_php_module_prefix at admin/include/locale.php');
 require_once('@kolab_php_module_prefix at admin/include/authenticate.php');
+require_once('@kolab_php_module_prefix at admin/include/form.class.php');
 
 $errors = array();
 
@@ -35,13 +36,14 @@
 else $page = "1";
 
 // Get all entries & dynamically split the letters with growing entries
+$entries = array();
 if( !$errors ) {
   if (isset($_SESSION['base_dn'])) $base_dn = $_SESSION['base_dn'];
   else $base_dn = 'k=kolab';
   $userfilter = "cn=*";
-  $filterattr = $_REQUEST['filterattr'];
-  $filtertype = $_REQUEST['filtertype'];
-  $filtervalue = $_REQUEST['filtervalue'];
+  $filterattr = KolabForm::getRequestVar('filterattr');
+  $filtertype = KolabForm::getRequestVar('filtertype');
+  $filtervalue = KolabForm::getRequestVar('filtervalue');
   if( !in_array( $filterattr, array( 'cn', 'mail' ) ) ) $filterattr = 'cn';
   if( isset( $filtervalue ) && !empty( $filtervalue ) ) {
 	switch( $filtertype ) {
@@ -63,11 +65,11 @@
   if( isset( $_REQUEST['alphalimit']) ) {
 	$ala='sn'; // alpha limit attibute
 	switch( $_REQUEST['alphalimit'] ) {
-	case a: $alphalimit = "(|($ala=a*)($ala=b*)($ala=c*)($ala=d*)($ala=e*)($ala=f*))"; break;
-	case g: $alphalimit = "(|($ala=g*)($ala=h*)($ala=i*)($ala=j*)($ala=k*)($ala=l*))"; break;
-	case m: $alphalimit = "(|($ala=m*)($ala=n*)($ala=o*)($ala=p*)($ala=q*)($ala=r*))"; break;
-	case s: $alphalimit = "(|($ala=s*)($ala=t*)($ala=u*)($ala=v*)($ala=w*)($ala=x*)($ala=y*)($ala=z*))"; break;
-	case other: $alphalimit = "(|($ala=æ*)($ala=ø*)($ala=å*)($ala=ä*)($ala=ö*)($ala=ü*)($ala=0*)($ala=1*)($ala=2*)($ala=3*)($ala=4*)($ala=5*)($ala=6*)($ala=7*)($ala=8*)($ala=9*))"; break;
+	case 'a': $alphalimit = "(|($ala=a*)($ala=b*)($ala=c*)($ala=d*)($ala=e*)($ala=f*))"; break;
+	case 'g': $alphalimit = "(|($ala=g*)($ala=h*)($ala=i*)($ala=j*)($ala=k*)($ala=l*))"; break;
+	case 'm': $alphalimit = "(|($ala=m*)($ala=n*)($ala=o*)($ala=p*)($ala=q*)($ala=r*))"; break;
+	case 's': $alphalimit = "(|($ala=s*)($ala=t*)($ala=u*)($ala=v*)($ala=w*)($ala=x*)($ala=y*)($ala=z*))"; break;
+	case 'other': $alphalimit = "(|($ala=æ*)($ala=ø*)($ala=å*)($ala=ä*)($ala=ö*)($ala=ü*)($ala=0*)($ala=1*)($ala=2*)($ala=3*)($ala=4*)($ala=5*)($ala=6*)($ala=7*)($ala=8*)($ala=9*))"; break;
 	default: $alphalimit = '';
 	}
   }



From cvs at intevation.de  Wed Mar 29 12:52:16 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 29 Mar 2006 12:52:16 +0200 (CEST)
Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user
	index.php.in, 1.2, 1.3 
Message-ID: <20060329105216.BE9E81006AA@lists.intevation.de>

Author: steffen

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

Modified Files:
	index.php.in 
Log Message:
Fix for issue848 + some cleanup

Index: index.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/index.php.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- index.php.in	9 Mar 2006 21:27:22 -0000	1.2
+++ index.php.in	29 Mar 2006 10:52:14 -0000	1.3
@@ -22,6 +22,7 @@
 require_once('@kolab_php_module_prefix at admin/include/headers.php');
 require_once('@kolab_php_module_prefix at admin/include/locale.php');
 require_once('@kolab_php_module_prefix at admin/include/authenticate.php');
+require_once('@kolab_php_module_prefix at admin/include/form.class.php');
 
 $errors = array();
 
@@ -47,6 +48,7 @@
 else $page = "1";
 
 // Get all entries & dynamically split the letters with growing entries
+$entries = array();
 if( !$errors ) {
   if (isset($_SESSION['base_dn'])) $base_dn = $_SESSION['base_dn'];
   else $base_dn = 'k=kolab';
@@ -55,9 +57,9 @@
 							  (array)$ldap->groupMembers( "cn=internal,$base_dn", 'maintainer' ) );
 
   $userfilter = "cn=*";
-  $filterattr = $_REQUEST['filterattr'];
-  $filtertype = $_REQUEST['filtertype'];
-  $filtervalue = $_REQUEST['filtervalue'];
+  $filterattr = KolabForm::getRequestVar('filterattr');
+  $filtertype = KolabForm::getRequestVar('filtertype');
+  $filtervalue = KolabForm::getRequestVar('filtervalue');
   if( !in_array( $filterattr, array( 'cn', 'uid', 'mail' ) ) ) $filterattr = 'cn';
   if( isset( $filtervalue ) && !empty( $filtervalue ) ) {
 	switch( $filtertype ) {
@@ -79,11 +81,11 @@
   if( isset( $_REQUEST['alphalimit']) ) {
 	$ala='sn'; // alpha limit attibute
 	switch( $_REQUEST['alphalimit'] ) {
-	case a: $alphalimit = "(|($ala=a*)($ala=b*)($ala=c*)($ala=d*)($ala=e*)($ala=f*))"; break;
-	case g: $alphalimit = "(|($ala=g*)($ala=h*)($ala=i*)($ala=j*)($ala=k*)($ala=l*))"; break;
-	case m: $alphalimit = "(|($ala=m*)($ala=n*)($ala=o*)($ala=p*)($ala=q*)($ala=r*))"; break;
-	case s: $alphalimit = "(|($ala=s*)($ala=t*)($ala=u*)($ala=v*)($ala=w*)($ala=x*)($ala=y*)($ala=z*))"; break;
-	case other: $alphalimit = "(|($ala=æ*)($ala=ø*)($ala=å*)($ala=ä*)($ala=ö*)($ala=ü*)($ala=0*)($ala=1*)($ala=2*)($ala=3*)($ala=4*)($ala=5*)($ala=6*)($ala=7*)($ala=8*)($ala=9*))"; break;
+	case 'a': $alphalimit = "(|($ala=a*)($ala=b*)($ala=c*)($ala=d*)($ala=e*)($ala=f*))"; break;
+	case 'g': $alphalimit = "(|($ala=g*)($ala=h*)($ala=i*)($ala=j*)($ala=k*)($ala=l*))"; break;
+	case 'm': $alphalimit = "(|($ala=m*)($ala=n*)($ala=o*)($ala=p*)($ala=q*)($ala=r*))"; break;
+	case 's': $alphalimit = "(|($ala=s*)($ala=t*)($ala=u*)($ala=v*)($ala=w*)($ala=x*)($ala=y*)($ala=z*))"; break;
+	case 'other': $alphalimit = "(|($ala=æ*)($ala=ø*)($ala=å*)($ala=ä*)($ala=ö*)($ala=ü*)($ala=0*)($ala=1*)($ala=2*)($ala=3*)($ala=4*)($ala=5*)($ala=6*)($ala=7*)($ala=8*)($ala=9*))"; break;
 	default: $alphalimit = '';
 	}
   }



From cvs at intevation.de  Wed Mar 29 13:29:00 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 29 Mar 2006 13:29:00 +0200 (CEST)
Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/addressbook
	addr.php, 1.10.2.4, 1.10.2.5 
Message-ID: <20060329112900.B699C100161@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	addr.php 
Log Message:
Backport of fix for issue848

Index: addr.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook/Attic/addr.php,v
retrieving revision 1.10.2.4
retrieving revision 1.10.2.5
diff -u -d -r1.10.2.4 -r1.10.2.5
--- addr.php	21 Feb 2006 02:33:07 -0000	1.10.2.4
+++ addr.php	29 Mar 2006 11:28:58 -0000	1.10.2.5
@@ -188,19 +188,32 @@
 			else $newdn = $dn;
 			debug("action=save, dn=$dn, newdn=$newdn<br/>\n");
 			if (strcmp($dn,$newdn) != 0) {
-			  if (($result=ldap_read($ldap->connection,$dn,"(objectclass=*)")) &&
-				  ($entry=ldap_first_entry($ldap->connection,$result)) &&
-				  ($oldattrs=ldap_get_attributes($ldap->connection,$entry))) {
-				foreach( $ldap_object as $k => $v ) if( $v == array() ) unset( $ldap_object[$k] );
-				if (!ldap_add($ldap->connection,$newdn, $ldap_object) || !ldap_delete($ldap->connection,$dn)) {
-				  array_push($errors, _("LDAP Error: could not rename ").$dn.
-							 " to ".$newdn." ".ldap_error($ldap->connection));
+			  // Check for distribution lists with this entry as member
+			  $ldap->search( $_SESSION['base_dn'], 
+							 '(&(objectClass=kolabGroupOfNames)(!(kolabDeleteFlag=*))(member='.$ldap->escape($dn).'))',
+							 array( 'dn', 'mail' ) );
+			  $distlists = $ldap->getEntries();
+			  unset( $distlists['count'] );
+			  foreach( $distlists as $distlist ) {
+				$dlcn = $distlist['mail'][0];
+				$errors[] = sprintf(_("Addressbook entry DN could not be modified, distribution list <a href='/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 );
+			  }
+
+			  if( !$errors ) {
+				if (($result=ldap_read($ldap->connection,$dn,"(objectclass=*)")) &&
+					($entry=ldap_first_entry($ldap->connection,$result)) &&
+					($oldattrs=ldap_get_attributes($ldap->connection,$entry))) {
+				  foreach( $ldap_object as $k => $v ) if( $v == array() ) unset( $ldap_object[$k] );
+				  if (!ldap_add($ldap->connection,$newdn, $ldap_object) || !ldap_delete($ldap->connection,$dn)) {
+					array_push($errors, _("LDAP Error: could not rename ").$dn.
+							   " to ".$newdn." ".ldap_error($ldap->connection));
+				  } else {
+					$messages[] = sprintf(_("%s successfully updated"), $newdn);
+				  }
+				  $dn = $newdn;
 				} else {
-				  $messages[] = sprintf(_("%s successfully updated"), $newdn);
+				  array_push($errors,_("LDAP Error: could not read ").$dn.": ".ldap_error($ldap->connection));
 				}
-				$dn = $newdn;
-			  } else {
-				array_push($errors,_("LDAP Error: could not read ").$dn.": ".ldap_error($ldap->connection));
 			  }
 			} else {
 			  if (!ldap_modify($ldap->connection, $dn, $ldap_object)) {



From cvs at intevation.de  Wed Mar 29 13:29:04 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 29 Mar 2006 13:29:04 +0200 (CEST)
Subject: wilde: utils/admin save-annotations.sh, 1.1,
	1.2 save-annotations.README, 1.1, 1.2 
Message-ID: <20060329112904.CB47E1006CF@lists.intevation.de>

Author: wilde

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

Modified Files:
	save-annotations.sh save-annotations.README 
Log Message:
Modified save-annotations.sh to use validate-skiplist.
Updated save-annotations.README accordingly.


Index: save-annotations.sh
===================================================================
RCS file: /kolabrepository/utils/admin/save-annotations.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- save-annotations.sh	24 Jan 2006 10:36:39 -0000	1.1
+++ save-annotations.sh	29 Mar 2006 11:29:02 -0000	1.2
@@ -13,6 +13,7 @@
 # Description:
 
 # Backup and check annotations db.
+# The checks are done using validate-skiplist
 
 # As the kolab/cyrus-imap annotations.db tends to break on a regular
 # basis, this script should be setup as a cronjob.
@@ -48,7 +49,7 @@
 USER=kolab-r
 
 # Used Binaries:
-CVT_CYRUSDB=/kolab/bin/cvt_cyrusdb
+CHECK_CYRUSDB=/kolab/bin/validate-skiplist
 
 # Command used:
 # - to copy annotations.db to backup
@@ -63,7 +64,7 @@
 # -------------------------------------------------------------------
 # Nothing to configure past this point...
 
-BACKUP_FILE="${BACKUP_DIR}/annotations.db-`date +%Y%m%d-%H:%M:%S`"
+BACKUP_FILE="${BACKUP_DIR}/annotations.db-`date +%Y%m%d-%H%M%S`"
 
 # Change identity if necessary
 if [ `whoami` != "$USER" ] ; then
@@ -106,11 +107,7 @@
 
 check-backup()
 {
-  temp_file="${BACKUP_DIR}/.tempflatdb"
-  # beware this takes a few seconds!
-  $CVT_CYRUSDB "$BACKUP_FILE" skiplist \
-    "$temp_file" flat >/dev/null 2>&1 && \
-    rm $temp_file
+  $CHECK_CYRUSDB "$BACKUP_FILE" >/dev/null 2>&1
 }
 
 compress-backup()

Index: save-annotations.README
===================================================================
RCS file: /kolabrepository/utils/admin/save-annotations.README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- save-annotations.README	24 Jan 2006 11:02:09 -0000	1.1
+++ save-annotations.README	29 Mar 2006 11:29:02 -0000	1.2
@@ -13,6 +13,19 @@
 mails even when the kolab-server fails!
 
 
+Prerequisites
+-------------
+
+validate-skiplist must be installed:
+
+- Build it from the included source file:
+  gcc -O2 validate-skiplist.c -o validate-skiplist
+
+- Copy (as root) validate-skiplist anywhere you like.  The default
+  configuration of save-annotations.sh expects it in /kolab/bin: 
+  cp validate-skiplist /kolab/bin
+
+
 Installation
 ------------
 



From cvs at intevation.de  Wed Mar 29 14:45:49 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 29 Mar 2006 14:45:49 +0200 (CEST)
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr
	kolabfilter.php.in, 1.7, 1.8 
Message-ID: <20060329124549.1C7211006D1@lists.intevation.de>

Author: steffen

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

Modified Files:
	kolabfilter.php.in 
Log Message:
Fix for Issue973 (quoting and rewriting From header)

Index: kolabfilter.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabfilter.php.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- kolabfilter.php.in	21 Feb 2006 10:26:01 -0000	1.7
+++ kolabfilter.php.in	29 Mar 2006 12:45:47 -0000	1.8
@@ -215,7 +215,7 @@
 	  } else {
 	    /* Rewrite */
 	    myLog("$from is not an allowed From address for unauthenticated users, rewriting", RM_LOG_DEBUG);
-	    return '"'.$adr->personal.'(UNTRUSTED, sender is <'.$sender.'>)" '.'<'.$from.'>';
+	    return '"'.str_replace(array("\\",'"'),array("\\\\",'\"'),$adr->personal).' (UNTRUSTED, sender is <'.$sender.'>)" '.'<'.$from.'>';
 	  }
 	}
       }
@@ -287,6 +287,7 @@
 while (!feof(STDIN) && !$headers_done) {
   $buffer = fgets(STDIN, 8192);
   $line = rtrim( $buffer, "\r\n");
+  myLog($line, RM_LOG_DEBUG);
   if( $line == '' ) {
     // Done with headers
     $headers_done = true;



From cvs at intevation.de  Wed Mar 29 14:46:14 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 29 Mar 2006 14:46:14 +0200 (CEST)
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr
	kolabfilter.php, 1.26.2.3, 1.26.2.4 
Message-ID: <20060329124614.944931006D1@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	kolabfilter.php 
Log Message:
Backport of: Fix for Issue973 (quoting and rewriting From header)

Index: kolabfilter.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/Attic/kolabfilter.php,v
retrieving revision 1.26.2.3
retrieving revision 1.26.2.4
diff -u -d -r1.26.2.3 -r1.26.2.4
--- kolabfilter.php	21 Feb 2006 11:58:34 -0000	1.26.2.3
+++ kolabfilter.php	29 Mar 2006 12:46:12 -0000	1.26.2.4
@@ -105,7 +105,7 @@
     $fromadr = $adr->mailbox.'@'.$adr->host;
     if( !ereg( "\(UNTRUSTED, sender is <$sender>\)", $from ) ) {
       myLog("$from is not an allowed From address for unauthenticated users, rewriting", RM_LOG_DEBUG);
-      return '"'.$adr->personal.'(UNTRUSTED, sender is <'.$sender.'>)" '.'<'.$fromadr.'>';
+      return '"'.str_replace(array("\\",'"'),array("\\\\",'\"'),$adr->personal).' (UNTRUSTED, sender is <'.$sender.'>)" '.'<'.$fromadr.'>';
     } /* else already rewritten */
   }
   return $from;



From cvs at intevation.de  Wed Mar 29 14:56:03 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 29 Mar 2006 14:56:03 +0200 (CEST)
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr
	kolabfilter.php.in, 1.8, 1.9 
Message-ID: <20060329125603.4BD231006CC@lists.intevation.de>

Author: steffen

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

Modified Files:
	kolabfilter.php.in 
Log Message:
ups

Index: kolabfilter.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabfilter.php.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- kolabfilter.php.in	29 Mar 2006 12:45:47 -0000	1.8
+++ kolabfilter.php.in	29 Mar 2006 12:56:01 -0000	1.9
@@ -287,7 +287,6 @@
 while (!feof(STDIN) && !$headers_done) {
   $buffer = fgets(STDIN, 8192);
   $line = rtrim( $buffer, "\r\n");
-  myLog($line, RM_LOG_DEBUG);
   if( $line == '' ) {
     // Done with headers
     $headers_done = true;



From cvs at intevation.de  Wed Mar 29 21:35:11 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed, 29 Mar 2006 21:35:11 +0200 (CEST)
Subject: richard: server/kolabd/kolabd/dist_conf gentoo,1.4,1.5 
Message-ID: <20060329193511.887A81005D3@lists.intevation.de>

Author: richard

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

Modified Files:
	gentoo 
Log Message:
Updates provided by Gunnar Wrobel <wrobel at gentoo.org> for gentoo

Index: gentoo
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/gentoo,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gentoo	9 Mar 2006 21:46:30 -0000	1.4
+++ gentoo	29 Mar 2006 19:35:09 -0000	1.5
@@ -95,7 +95,7 @@
 emailserver_grp=root
 emailserver_mail_owner=postfix
 emailserver_setgid_grp=postdrop
-emailserver_master_usr=kolab-n
+emailserver_master_usr=${kolab_grp}
 emailserver_default_privs=nobody
 
 ### -> files
@@ -104,11 +104,12 @@
 emailserver_confdir=${sysconfdir}/postfix
 emailserver_socket=${localstatedir}/kolab/lmtp
 emailserver_logfile=${emailserver_localstatedir}/log/postfix.log
+aliases_file=${sysconfdir}/mail/aliases
 
 #--------------------------------------------------------------------
 
 #####################################################################
-# Postfix parameters
+# Sasl parameters
 
 ### -> files
 
@@ -140,7 +141,7 @@
 
 imap_masterlogfile=${imap_statedir}/log/master.log
 imap_misclogfile=${imap_statedir}/log/misc.log
-imap_spool=${imap_statedir}/spool
+imap_spool=${localstatedir}/spool/imap
 imap_sievedir=${imap_statedir}/sieve
 imap_lmtp=${imap_statedir}/lmtp
 
@@ -187,8 +188,7 @@
 
 ### -> log files
 
-ldapserver_replogfile=${logdir}/openldap/replog
-ldapserver_logfile=${logdir}/openldap/openldap.log
+ldapserver_logfile=${logdir}/openldap.log
 
 ### -> runtime files
 
@@ -197,6 +197,7 @@
 ldapserver_pidfile=${ldapserver_rundir}/slapd.pid
 ldapserverslurpd_pidfile=${ldapserver_rundir}/slurpd.pid
 ldapserver_argsfile=${ldapserver_rundir}/slapd.args
+ldapserver_replogfile=${ldapserver_rundir}/replog
 
 #--------------------------------------------------------------------
 
@@ -215,7 +216,7 @@
 webserver_accesslogfile=${webserver_logdir}/apache-access.log
 webserver_acceptlock=${webserver_logdir}/accept.lock
 webserver_runtime_status=${webserver_logdir}/apache_runtime_status
-webserver_sessions=${kolab_statedir}/httpd_sessions
+webserver_sessions=${localstatedir}/cache/httpd_sessions
 
 webserver_document_root=${wwwdir}/kolab
 webserver_cgidir=${webserver_document_root}/cgi-bin
@@ -230,6 +231,7 @@
 #####################################################################
 # PHP parameters
 
+phpini_dir=${sysconfdir}/php/apache2-php5/
 phplibdir=${datadir}/php
 phplibdir2=${datadir}/php
 phppeardir=${phplibdir}/horde
@@ -289,12 +291,12 @@
 resmgr_confdir=${sysconfdir}/kolab/resmgr
 resmgr_filterdir=${kolab_statedir}/resmgr/filter
 resmgr_scriptsdir=${datadir}/kolabd/resmgr/scripts
+freebusy_logfile=${kolab_logdir}/freebusy/freebusy.log
+freebusy_cachedir=${localstatedir}/cache/freebusy
 
 #--------------------------------------------------------------------
 
 fbview_logfile=${localstatedir}/resmgr/fbview.log
-freebusy_logfile=${localstatedir}/resmgr/freebusy.log
-freebusy_cachedir=${webserver_document_root}/freebusy/cache
 
 graveyard_uidcache=${localstatedir}/kolab/graveyard_uidcache.db
 graveyard_tscache=${localstatedir}/kolab/graveyard_tscache.db



From cvs at intevation.de  Thu Mar 30 21:58:43 2006
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu, 30 Mar 2006 21:58:43 +0200 (CEST)
Subject: richard: server/kolabd/kolabd/dist_conf suse,1.48,1.49 
Message-ID: <20060330195843.7A24B1006B8@lists.intevation.de>

Author: richard

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

Modified Files:
	suse 
Log Message:
Better directorie for freebusy_logfile fbview_logfile and resmgr_filterdir

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- suse	26 Mar 2006 18:47:02 -0000	1.48
+++ suse	30 Mar 2006 19:58:41 -0000	1.49
@@ -152,13 +152,13 @@
 resmgr_confdir=${sysconfdir}/kolab/resmgr
 resmgr_conffile_usr=kolab
 resmgr_conffile_grp=root
-resmgr_filterdir=${localstatedir}/resmgr/filter
+resmgr_filterdir=${localstatedir}/lib/kolab/resmgr
 resmgr_scriptsdir=${kolab_scriptsdir}/resmgr
 resmgr_usr=root
 resmgr_grp=root
 
-fbview_logfile=${localstatedir}/resmgr/fbview.log
-freebusy_logfile=${localstatedir}/resmgr/freebusy.log
+fbview_logfile=${localstatedir}/log/kolab/fbview.log
+freebusy_logfile=${localstatedir}/log/kolab/freebusy.log
 freebusy_cachedir=${webserver_document_root}${webserver_web_prefix}/freebusy/cache
 
 graveyard_uidcache=${localstatedir}/kolab/graveyard_uidcache.db