? kolabd.diff
Index: kolabd/ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.4
diff -a -u -r1.4 ChangeLog
--- kolabd/ChangeLog	27 Nov 2005 23:57:02 -0000	1.4
+++ kolabd/ChangeLog	4 Dec 2005 21:06:26 -0000
@@ -1,3 +1,21 @@
+2005-12-04 Marcus Huwe <suse-tux@gmx.de>
+	* Makefile.am: changed kolab_upgrade.in to kolab_upgrade in
+	  dist_kolab_SCRIPTS
+
+2005-11-27 Richard Bos <richard@radoeka.nl>
+	* dist_conf/common: added imap_confperm, kolab_gid and kolab_statedir
+	  needed by a future patch to perl-kolab
+	  Removed webserver_phpdir as it has been replaced by phplibdir2
+	* dist_conf/kolab: removed kolabd_usr, it is not used anywhere
+	  Removed webserver_phpdir as it has been replaced by phplibdir2
+	* templates/httpd.conf.template.in changed webserver_phpdir in
+	  phplibdir2
+	* templates/php.ini.template.in changed webserver_phpdir in
+	  phplibdir2
+	* templates/session_vars.php.template.in changed webserver_phpdir
+	  in phplibdir2
+	* Makefile.am: added kolab_upgrade
+
 2005-11-27 Marcus Hüwe <suse-tux@gmx.de>
 	* dist_conf/common: altered bash_exec, perl_exec to respectively:
 	  BASH and PERL.
Index: kolabd/Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.4
diff -a -u -r1.4 Makefile.am
--- kolabd/Makefile.am	22 Nov 2005 14:21:58 -0000	1.4
+++ kolabd/Makefile.am	4 Dec 2005 21:06:26 -0000
@@ -16,6 +16,7 @@
 	kolab kolab_bootstrap \
 	workaround.sh \
 	kolabquotawarn \
+	kolab_upgrade \
 	kolab_smtpdpolicy 
 
 
@@ -481,6 +482,13 @@
 	 chmod a+x workaround.sh
 CLEANFILES += workaround.sh
 EXTRA_DIST += workaround.sh.in
+
+kolab_upgrade:
+	@$(mkinstalldirs) .
+	$(do_subst) <$(srcdir)/kolab_upgrade.in >$@
+	chmod a+x kolab_upgrade
+CLEANFILES += kolab_upgrade
+EXTRA_DIST += kolab_upgrade.in
 
 kolab_smtpdpolicy:
 	@$(mkinstalldirs) .
Index: kolabd/dist_conf/common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.4
diff -a -u -r1.4 common
--- kolabd/dist_conf/common	27 Nov 2005 23:57:02 -0000	1.4
+++ kolabd/dist_conf/common	4 Dec 2005 21:06:29 -0000
@@ -54,6 +54,7 @@
 	-e 's,[@]graveyard_tscache[@],$(graveyard_tscache),g' \
 	-e 's,[@]graveyard_uidcache[@],$(graveyard_uidcache),g' \
 	-e 's,[@]imap_confdir[@],$(imap_confdir),g' \
+	-e 's,[@]imap_confperm[@],$(imap_confperm),g' \
 	-e 's,[@]imap_grp[@],$(imap_grp),g' \
 	-e 's,[@]imap_lmtp[@],$(imap_lmtp),g' \
 	-e 's,[@]imap_masterlogfile[@],$(imap_masterlogfile),g' \
@@ -62,6 +63,7 @@
 	-e 's,[@]imap_spool[@],$(imap_spool),g' \
 	-e 's,[@]imap_statedir[@],$(imap_statedir),g' \
 	-e 's,[@]imap_usr[@],$(imap_usr),g' \
+	-e 's,[@]kolab_gid[@],$(kolab_gid),g' \
 	-e 's,[@]kolab_grp[@],$(kolab_grp),g' \
 	-e 's,[@]kolab_mailboxuiddb[@],$(kolab_mailboxuiddb),g' \
 	-e 's,[@]kolab_mgrp[@],$(kolab_mgrp),g' \
@@ -70,6 +72,7 @@
 	-e 's,[@]kolab_rcdir[@],$(kolab_rcdir),g' \
 	-e 's,[@]kolab_rgrp[@],$(kolab_rgrp),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,[@]ldapserver_argsfile[@],$(ldapserver_argsfile),g' \
@@ -99,7 +102,6 @@
 	-e 's,[@]webserver_errorlogfile[@],$(webserver_errorlogfile),g' \
 	-e 's,[@]webserver_grp[@],$(webserver_grp),g' \
 	-e 's,[@]webserver_musr[@],$(webserver_musr),g' \
-	-e 's,[@]webserver_phpdir[@],$(webserver_phpdir),g' \
 	-e 's,[@]webserver_pidfile[@],$(webserver_pidfile),g' \
 	-e 's,[@]webserver_runtime_status[@],$(webserver_runtime_status),g' \
 	-e 's,[@]webserver_sessions[@],$(webserver_sessions),g' \
Index: kolabd/dist_conf/kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.4
diff -a -u -r1.4 kolab
--- kolabd/dist_conf/kolab	27 Nov 2005 23:57:02 -0000	1.4
+++ kolabd/dist_conf/kolab	4 Dec 2005 21:06:29 -0000
@@ -98,7 +98,6 @@
 imap_sievedir=${imap_statedir}/sieve
 imap_lmtp=${imap_statedir}/lmtp
 
-kolabd_usr=root
 kolab_statedir=${localstatedir}/kolab
 kolab_logdir=${kolab_statedir}/log
 kolab_pidfile=${kolab_statedir}/kolab.pid
@@ -121,7 +120,6 @@
 
 webserver_document_root=${localstatedir}/kolab/www
 webserver_cgidir=${webserver_document_root}/cgi-bin
-webserver_phpdir=${localstatedir}/kolab/php
 webserver_sessions=${localstatedir}/kolab/httpd_sessions
 webserver_logdir=${localstatedir}/apache/log
 webserver_acceptlock=${webserver_logdir}/accept.lock
Index: kolabd/templates/httpd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.conf.template.in,v
retrieving revision 1.1
diff -a -u -r1.1 httpd.conf.template.in
--- kolabd/templates/httpd.conf.template.in	13 Sep 2005 14:38:22 -0000	1.1
+++ kolabd/templates/httpd.conf.template.in	4 Dec 2005 21:06:32 -0000
@@ -233,7 +233,7 @@
 @@@endif@@@
    DavMinTimeout 600
    AddDefaultCharset Off  
-   php_value include_path ".:@webserver_phpdir@:@webserver_phpdir@/pear:/php/include:@phplibdir@"
+   php_value include_path ".:@phplibdir2@:@phplibdir2@/pear:/php/include:@phplibdir@"
    #php_admin_flag safe_mode on
 </Directory>
 
@@ -266,7 +266,7 @@
 <Directory "@webserver_document_root@/fbview">
     AllowOverride All
     Allow from all
-    php_value include_path ".:@webserver_phpdir@:@webserver_phpdir@/pear:/php/include:@phplibdir@"
+    php_value include_path ".:@phplibdir2@:@phplibdir2@/pear:/php/include:@phplibdir@"
 </Directory>
 
 <Directory "@webserver_document_root@/admin">
Index: kolabd/templates/php.ini.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/php.ini.template.in,v
retrieving revision 1.1
diff -a -u -r1.1 php.ini.template.in
--- kolabd/templates/php.ini.template.in	13 Sep 2005 14:38:22 -0000	1.1
+++ kolabd/templates/php.ini.template.in	4 Dec 2005 21:06:33 -0000
@@ -370,7 +370,7 @@
 ;
 ; Windows: "\path1;\path2"
 ;include_path = ".;c:\php\includes"
-include_path = ".:/php/include:@phplibdir@:@webserver_phpdir@:@webserver_phpdir@/pear"
+include_path = ".:/php/include:@phplibdir@:@phplibdir2@:@phplibdir2@/pear"
 
 ; The root of the PHP pages, used only if nonempty.
 ; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
Index: kolabd/templates/session_vars.php.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/session_vars.php.template.in,v
retrieving revision 1.1
diff -a -u -r1.1 session_vars.php.template.in
--- kolabd/templates/session_vars.php.template.in	13 Sep 2005 14:38:22 -0000	1.1
+++ kolabd/templates/session_vars.php.template.in	4 Dec 2005 21:06:33 -0000
@@ -1,5 +1,5 @@
 KOLAB_META_START
-TARGET=@webserver_phpdir@/admin/include/session_vars.php
+TARGET=@phplibdir2@/admin/include/session_vars.php
 PERMISSIONS=0640
 OWNERSHIP=@kolab_musr@:@kolab_grp@
 KOLAB_META_END
