Mercurial > dnsbl

changeset 164:5809bcdc325b stable-6-0-4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
spamassassin changes
author carl
date Sun, 26 Aug 2007 19:43:35 -0700
parents 97d7da45fe2a
children bf828f785407
files Makefile.am dnsbl.spec.in sendmail.st src/context.cpp src/context.h src/dnsbl.cpp src/spamass.cpp.in xml/dnsbl.in
diffstat 8 files changed, 16 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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
 
--- 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
Binary file sendmail.st has changed
--- 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) {
--- 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);
--- 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 {
--- 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!
--- 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>