steffen: server/kolabd/kolabd ChangeLog, 1.1.1.1, 1.2 Makefile.am, 1.3, 1.4 configure.ac, 1.2, 1.3 kolab_bootstrap.in, 1.6, 1.7

cvs at intevation.de cvs at intevation.de
Tue Nov 22 15:22:00 CET 2005


Author: steffen

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

Modified Files:
	ChangeLog Makefile.am configure.ac kolab_bootstrap.in 
Log Message:
Patch from issue979 applied, thanks Richard

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- ChangeLog	23 Nov 2004 20:26:47 -0000	1.1.1.1
+++ ChangeLog	22 Nov 2005 14:21:58 -0000	1.2
@@ -1,3 +1,22 @@
+2005-11-12 Richard Bos <richard at radoeka.nl>
+	* Removed --enable-ldapconfdir and --enable-amavisdconfdir
+	  as these are defined in a dist_conf distribution file
+	* Cleaned up dist_conf/common: put things in alphabetic order =>
+	  removed duplicated lines and combined variables that are used
+	  for the same purpose:
+	  amavisd_confdir for amavisdconfdir and
+	  ldapserver_confdir for ldapconfdir
+	* renamed postfix_logfile to emailserver_logfile to make it
+	  consistent with the rest of the variables
+	* Added ldapserver_statedir and used this variable in the definition of:
+	  ldapserver_dir, ldapserver_replogfile, ldapserver_argsfile
+	  ldapserver_logfile and ldapserver_rundir
+	* Altered @ldapserver_confdir@ to @ldapserver_statedir@, in
+	  kolab_bootstrap.in solving issue979
+	* Reflected the changes above in other files
+	* Make 'make distcheck' work by adding $srcdir to the distribution
+	  line in configure.ac
+
 2004-07-12  Martin Konold <martin.konold at erfrakon.de>
         * Added multiple sanity checks (running services etc.)
 

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am	13 Oct 2005 23:56:51 -0000	1.3
+++ Makefile.am	22 Nov 2005 14:21:58 -0000	1.4
@@ -83,7 +83,7 @@
 ldapschema_FILES =  kolab2.schema \
 	rfc2739.schema
 
-ldapschemadir = $(ldapconfdir)/schema
+ldapschemadir = $(ldapserver_confdir)/schema
 dist_ldapschema_DATA = $(ldapschema_FILES)
 
 
@@ -95,7 +95,7 @@
 	amavisd/en_US/template-virus-recipient.txt \
 	amavisd/en_US/template-virus-sender.txt
 
-amavisdusdir = $(amavisdconfdir)/templates/en_US
+amavisdusdir = $(amavisd_confdir)/templates/en_US
 dist_amavisdus_DATA = $(amavisdus_FILES)
 
 
@@ -107,7 +107,7 @@
 	amavisd/de/template-virus-recipient.txt \
 	amavisd/de/template-virus-sender.txt
 
-amavisddedir = $(amavisdconfdir)/templates/de
+amavisddedir = $(amavisd_confdir)/templates/de
 dist_amavisdde_DATA = $(amavisdde_FILES)
 
 

Index: configure.ac
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/configure.ac,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- configure.ac	3 Oct 2005 01:07:55 -0000	1.2
+++ configure.ac	22 Nov 2005 14:21:58 -0000	1.3
@@ -14,23 +14,9 @@
 AC_ARG_ENABLE([dist],
   [AC_HELP_STRING([--enable-dist=DIST],
      [distribution target (default: openpkg)])],
-     [distribution=dist_conf/$enable_dist],
-   [distribution=dist_conf/kolab])
+     [distribution=$srcdir/dist_conf/$enable_dist],
+   [distribution=$srcdir/dist_conf/kolab])
 AC_SUBST_FILE(distribution)
-
-AC_ARG_ENABLE([ldapconfdir],
-  [AC_HELP_STRING([--enable-ldapconfdir=DIR],
-  	 [The LDAP configuration dir (default: SYSCONFDIR/openldap)])],
-  [ldapconfdir="$enable_ldapconfdir"],
-  [ldapconfdir="\$(sysconfdir)/openldap"])
-AC_SUBST(ldapconfdir)
-
-AC_ARG_ENABLE([amavasdconfdir],
-  [AC_HELP_STRING([--enable-amavisdconfdir=DIR],
-    [The amavisd configuration dir (default: SYSCONFDIR/amavisd)])],
-  [amavisdconfdir="$enable_amavisdconfdir"],
-  [amavisdconfdir="\$(sysconfdir)/amavisd"])
-AC_SUBST(amavisdconfdir)  
 
 # Checks for libraries.
 

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- kolab_bootstrap.in	22 Nov 2005 11:22:57 -0000	1.6
+++ kolab_bootstrap.in	22 Nov 2005 14:21:58 -0000	1.7
@@ -819,7 +819,7 @@
 of kolabhosts on the master before proceeding.
 EOS
   kolab_system("ssh -CA $master_host @bindir@/openpkg rc openldap stop");
-  kolab_system("ssh -CA $master_host @libdir@/openpkg/tar -C @ldapserver_confdir@ -pcf - openldap-data | @libdir@/openpkg/tar -C @ldapserver_confdir@ -pxf -");
+  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 @bindir@/openpkg rc openldap start");
 
   print "Updating configuration, please ignore any initial errors from kolabconf\n\n";





More information about the commits mailing list