# HG changeset patch
# User carl
# Date 1188182615 25200
# Node ID 5809bcdc325be4a960077b8100d8f079313ebd06
# Parent  97d7da45fe2a03a577a4512350b21282011d1ce6
spamassassin changes


diff -r 97d7da45fe2a -r 5809bcdc325b Makefile.am
--- a/Makefile.am	Sun Aug 26 19:03:17 2007 -0700
+++ b/Makefile.am	Sun Aug 26 19:43:35 2007 -0700
@@ -15,6 +15,8 @@
 	   mv -f $(sysconfdir)/dnsbl/dnsbl /etc/rc.d/init.d
 	   mkdir $(sysconfdir)/dnsbl/autowhite
 	   chown dnsbl:root $(sysconfdir)/dnsbl/autowhite
+	   mkdir $(sysconfdir)/dnsbl/.spamassassin
+	   chown dnsbl:root $(sysconfdir)/dnsbl/.spamassassin
 	   /sbin/chkconfig --del dnsbl
 	   /sbin/chkconfig --add dnsbl
 
diff -r 97d7da45fe2a -r 5809bcdc325b dnsbl.spec.in
--- a/dnsbl.spec.in	Sun Aug 26 19:03:17 2007 -0700
+++ b/dnsbl.spec.in	Sun Aug 26 19:43:35 2007 -0700
@@ -66,6 +66,7 @@
 mv AUTHORS COPYING ChangeLog NEWS README                    $RPM_BUILD_ROOT%{_datadir}/doc/@PACKAGE@-@VERSION@
 mkdir -p %{buildroot}/var/run/@PACKAGE@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/@PACKAGE@/autowhite
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/@PACKAGE@/.spamassassin
 
 %pre
 
@@ -99,6 +100,7 @@
 /etc/rc.d/init.d/@PACKAGE@
 %dir %attr(0750,@PACKAGE@,root) /var/run/@PACKAGE@
 %dir %attr(0750,@PACKAGE@,root) %{_sysconfdir}/@PACKAGE@/autowhite
+%dir %attr(0750,@PACKAGE@,root) %{_sysconfdir}/@PACKAGE@/.spamassassin
 
 
 %changelog
diff -r 97d7da45fe2a -r 5809bcdc325b sendmail.st
Binary file sendmail.st has changed
diff -r 97d7da45fe2a -r 5809bcdc325b src/context.cpp
--- a/src/context.cpp	Sun Aug 26 19:03:17 2007 -0700
+++ b/src/context.cpp	Sun Aug 26 19:43:35 2007 -0700
@@ -1049,6 +1049,14 @@
 
 
 ////////////////////////////////////////////////
+// clear all global strings, helper for valgrind checking
+//
+void clear_strings() {
+	discard(all_strings);
+}
+
+
+////////////////////////////////////////////////
 //
 bool tsa(TOKEN &tok, char *token);
 bool tsa(TOKEN &tok, char *token) {
diff -r 97d7da45fe2a -r 5809bcdc325b src/context.h
--- a/src/context.h	Sun Aug 26 19:03:17 2007 -0700
+++ b/src/context.h	Sun Aug 26 19:43:35 2007 -0700
@@ -290,6 +290,7 @@
 void discard(string_set &s);
 char* register_string(string_set &s, char *name);
 char* register_string(char *name);
+void  clear_strings();
 CONFIG *parse_config(char *fn);
 bool  load_conf(CONFIG &dc, char *fn);
 void* verify_closer(void *arg);
diff -r 97d7da45fe2a -r 5809bcdc325b src/dnsbl.cpp
--- a/src/dnsbl.cpp	Sun Aug 26 19:03:17 2007 -0700
+++ b/src/dnsbl.cpp	Sun Aug 26 19:43:35 2007 -0700
@@ -1412,6 +1412,7 @@
 		if (conf) {
 			conf->dump();
 			delete conf;
+			clear_strings();	// for valgrind checking
 			return 0;
 		}
 		else {
diff -r 97d7da45fe2a -r 5809bcdc325b src/spamass.cpp.in
--- a/src/spamass.cpp.in	Sun Aug 26 19:03:17 2007 -0700
+++ b/src/spamass.cpp.in	Sun Aug 26 19:43:35 2007 -0700
@@ -228,7 +228,6 @@
             // execute spamc
             char* argv[3];
             argv[0] = "@SPAMC@";
-            argv[0] = "/usr/bin/testspamc";
             argv[1] = "-c";
             argv[2] = NULL;
             execvp(argv[0] , argv); // does not return!
diff -r 97d7da45fe2a -r 5809bcdc325b xml/dnsbl.in
--- a/xml/dnsbl.in	Sun Aug 26 19:03:17 2007 -0700
+++ b/xml/dnsbl.in	Sun Aug 26 19:43:35 2007 -0700
@@ -12,7 +12,7 @@
 
     <refentry id="@PACKAGE@.1">
         <refentryinfo>
-            <date>2007-07-10</date>
+            <date>2007-07-26</date>
         </refentryinfo>
 
         <refmeta>
@@ -530,7 +530,7 @@
 
     <refentry id="@PACKAGE@.conf.5">
         <refentryinfo>
-            <date>2007-07-10</date>
+            <date>2007-07-26</date>
         </refentryinfo>
 
         <refmeta>