gunnar: server/kolabd/kolabd kolab_upgrade.in, 1.4, 1.5 kolabcheckperm.in, 1.3, 1.4 kolabd.in, 1.6, 1.7 kolabd.spec.in, 1.11, 1.12 kolabquotareport.in, 1.2, 1.3 kolabquotawarn.in, 1.12, 1.13

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	kolab_upgrade.in kolabcheckperm.in kolabd.in kolabd.spec.in 
	kolabquotareport.in kolabquotawarn.in 
Log Message:
Fixes for the splitted packages. Added kolabconf dependency. Modified the perl scripts so that we don't create the impression that the configuration is loaded before the perl imports are handled.

Index: kolab_upgrade.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_upgrade.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kolab_upgrade.in	31 Jul 2007 11:54:33 -0000	1.4
+++ kolab_upgrade.in	2 Aug 2007 06:49:43 -0000	1.5
@@ -7,11 +7,10 @@
 
 use Term::ReadKey;
 use Kolab;
-
-Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
-
 use Kolab::Util;
 use Kolab::LDAP;
+
+Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
 
 Kolab::LDAP::startup("@kolab_statedir@");
 

Index: kolabcheckperm.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabcheckperm.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolabcheckperm.in	31 Jul 2007 11:54:33 -0000	1.3
+++ kolabcheckperm.in	2 Aug 2007 06:49:43 -0000	1.4
@@ -9,10 +9,9 @@
 
 use strict;
 use Kolab;
-
-Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
-
 use Kolab::Util;
 use Kolab::Conf;
+
+Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
 
 exit( Kolab::Conf::checkPermissions>0?0:-1 );

Index: kolabd.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- kolabd.in	31 Jul 2007 11:54:33 -0000	1.6
+++ kolabd.in	2 Aug 2007 06:49:43 -0000	1.7
@@ -42,13 +42,12 @@
 use Sys::Syslog;
 use IO::File;
 use Kolab;
-
-Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
-
 use Kolab::Util;
 use Kolab::LDAP;
 use Kolab::LDAP::Backend;
 use vars qw(%pids);
+
+Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
 
 openlog('kolabd', 'cons, pid', 'user');
 

Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- kolabd.spec.in	17 Jul 2007 15:07:15 -0000	1.11
+++ kolabd.spec.in	2 Aug 2007 06:49:43 -0000	1.12
@@ -64,7 +64,8 @@
 PreReq:       perl-ssl
 PreReq:       perl-www
 PreReq:       perl-ldap
-PreReq:       perl-kolab >= 5.8.8-20070607
+PreReq:       perl-kolab >= 2.1.99-20070801
+PreReq:       kolabconf
 AutoReq:      no
 AutoReqProv:  no
 

Index: kolabquotareport.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabquotareport.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolabquotareport.in	31 Jul 2007 11:54:33 -0000	1.2
+++ kolabquotareport.in	2 Aug 2007 06:49:43 -0000	1.3
@@ -35,12 +35,11 @@
 use Mail::Message;
 use Cyrus::IMAP::Admin;
 use Kolab;
-
-Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
-
 use Kolab::Util;
 use Kolab::LDAP;
 use vars qw($opt_d);
+
+Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
 
 Kolab::LDAP::startup("@kolab_statedir@");
 

Index: kolabquotawarn.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabquotawarn.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- kolabquotawarn.in	31 Jul 2007 11:54:33 -0000	1.12
+++ kolabquotawarn.in	2 Aug 2007 06:49:43 -0000	1.13
@@ -37,13 +37,12 @@
 use Mail::Transport::SMTP;
 use Cyrus::IMAP::Admin;
 use Kolab;
-
-Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
-
 use Kolab::Util;
 use Kolab::LDAP;
 use File::Basename;
 use vars qw($opt_d);
+
+Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
 
 Kolab::LDAP::startup("@kolab_statedir@");