@@ -1,3 +1,8 @@

+Wed Feb 18 03:12:12 CET 2009 (acab)

+-----------------------------------

+ * clamav-milter: die on TERM (bb#1400)

+		  install conf file on make install

+

 Tue Feb 17 23:12:19 EET 2009 (edwin)

 ------------------------------------

  * unit_tests/check_clamd.c: disable test on BSD

@@ -244,6 +244,7 @@ void cpool_free(void) {

     if(!quitting) {

 	logg("*Killing the monitor and stopping\n");

+	quitting = 1;

 	pthread_cond_signal(&mon_cond);

 	pthread_join(probe_th, NULL);

     }

@@ -25,3 +25,9 @@ install-data-local:

 	$(INSTALL_DATA) $(srcdir)/clamd.conf $(DESTDIR)$(CFGINST)

 	@test -f $(DESTDIR)$(CFGINST)/freshclam.conf || \

 	$(INSTALL_DATA) $(srcdir)/freshclam.conf $(DESTDIR)$(CFGINST)

+if BUILD_CLAMD

+if HAVE_MILTER

+	@test -f $(DESTDIR)$(CFGINST)/clamav-milter.conf || \

+	$(INSTALL_DATA) $(srcdir)/clamav-milter.conf $(DESTDIR)$(CFGINST)

+endif

+endif

@@ -397,6 +397,8 @@ install-data-local:

 	$(INSTALL_DATA) $(srcdir)/clamd.conf $(DESTDIR)$(CFGINST)

 	@test -f $(DESTDIR)$(CFGINST)/freshclam.conf || \

 	$(INSTALL_DATA) $(srcdir)/freshclam.conf $(DESTDIR)$(CFGINST)

+@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	@test -f $(DESTDIR)$(CFGINST)/clamav-milter.conf || \

+@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	$(INSTALL_DATA) $(srcdir)/clamav-milter.conf $(DESTDIR)$(CFGINST)

 # Tell versions [3.59,3.63) of GNU make to not export all variables.

 # Otherwise a system limit (for SysV at least) may be exceeded.

 .NOEXPORT: