wilde: server/kolabd/kolabd ChangeLog, 1.164, 1.165 Makefile.am, 1.39, 1.40

[cvs at kolab.org]

Author: wilde

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Added kolabconf template for spamassassin/local.cf.
Fixes kolab/issue2244 and kolab/issue2586.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -d -r1.164 -r1.165
--- ChangeLog	22 Apr 2008 14:03:34 -0000	1.164
+++ ChangeLog	29 Apr 2008 14:50:49 -0000	1.165
@@ -1,3 +1,14 @@
+2008-04-29  Sascha Wilde  <wilde at intevation.de>
+
+	* dist_conf/kolab (spamassassin_confdir): New variable.
+
+	* dist_conf/common (do_subst): Added `spamassassin_confdir'.
+
+	* templates/local.cf.template.in: New file with some rules similar
+	to what was done in 2.1 by patching spamassassin.
+
+	* Makefile.am (kolabtemplate_FILES): Added new local.cf template.
+
 2008-04-22  Thomas Arendsen Hein <thomas at intevation.de>
 
 	* templates/imapd.annotation_definitions.template.in:

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- Makefile.am	5 Mar 2008 17:13:15 -0000	1.39
+++ Makefile.am	29 Apr 2008 14:50:49 -0000	1.40
@@ -72,7 +72,8 @@
 	templates/slapd.replicas.template \
 	templates/smtpd.conf.template \
 	templates/transport.template \
-	templates/virtual.template
+	templates/virtual.template \
+	templates/local.cf.template
 
 kolabtemplatedir = $(kolabconfdir)/templates
 if OPENPKG
@@ -516,6 +517,12 @@
 	$(do_subst) <$(srcdir)/templates/amavisd.conf.template.in >$@
 CLEANFILES += templates/amavisd.conf.template
 EXTRA_DIST += templates/amavisd.conf.template.in
+
+templates/local.cf.template: templates/local.cf.template.in
+	@$(mkinstalldirs) templates
+	$(do_subst) <$(srcdir)/templates/local.cf.template.in >$@
+CLEANFILES += templates/local.cf.template
+EXTRA_DIST += templates/local.cf.template.in
 
 workaround.sh: workaround.sh.in
 	@$(mkinstalldirs) .