[pkg-dspam-commits] r69 - in trunk/debian: . config patches

[Matthijs Mohlmann]

Author: active2-guest
Date: Wed Jan 25 10:15:33 2006
New Revision: 69

Modified:
   trunk/debian/changelog
   trunk/debian/config/mysql.conf
   trunk/debian/patches/add-config-dir.dpatch
Log:
 * Fix a mem leak in add-config-dir patch.
 * New upstream release.
 * Improved the message about mysql in mysql configuration of dspam.


Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog	(original)
+++ trunk/debian/changelog	Wed Jan 25 10:15:33 2006
@@ -1,14 +1,16 @@
-dspam (3.6.2-3) experimental; urgency=low
+dspam (3.6.3-1) experimental; urgency=low
 
+  * New upstream release.
   * Fix path to purge-3.sql in libdspam7-drv-sqlite3 (Closes: #347168)
   * Move hash backend into dspam. This solves a lot of problems around
     installing several other backends.
-  * Suggests libdspam7-drv instead of depending on it.
+  * Suggests libdspam7-drv instead of depending on it. (Closes: #349591)
   * Improved the cron.daily for the hash backend (It now checks if dspam is
     running with the hash backend)
   * Improved add-config-dir patch to prevent a segfault. (Closes: #347852)
+  * Add a free() call to fix a memleak.
 
- -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>  Fri, 13 Jan 2006 21:53:47 +0100
+ -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>  Wed, 25 Jan 2006 11:09:18 +0100
 
 dspam (3.6.2-2) experimental; urgency=low
 

Modified: trunk/debian/config/mysql.conf
==============================================================================
--- trunk/debian/config/mysql.conf	(original)
+++ trunk/debian/config/mysql.conf	Wed Jan 25 10:15:33 2006
@@ -13,6 +13,8 @@
 
 # Use this if you have the 4.1 quote bug (see doc/mysql.txt)
 # mysql-server-4.1 version => 4.1.15-1 doesn't have this bug.
+# This bug doesn't apply to debian mysql server, it is already fixed in the
+# mysql packages.
 #MySQLSupressQuote	on
 
 # If you're running DSPAM in client/server (daemon) mode, uncomment the

Modified: trunk/debian/patches/add-config-dir.dpatch
==============================================================================
--- trunk/debian/patches/add-config-dir.dpatch	(original)
+++ trunk/debian/patches/add-config-dir.dpatch	Wed Jan 25 10:15:33 2006
@@ -5,9 +5,9 @@
 ## DP: Add config item include that include directories.
 
 @DPATCH@
-diff -urNad dspam-3.6.2~/src/read_config.c dspam-3.6.2/src/read_config.c
---- dspam-3.6.2~/src/read_config.c	2006-01-13 22:21:17.000000000 +0100
-+++ dspam-3.6.2/src/read_config.c	2006-01-13 22:24:08.854628500 +0100
+diff -urNad dspam-3.6.3~/src/read_config.c dspam-3.6.3/src/read_config.c
+--- dspam-3.6.3~/src/read_config.c	2006-01-25 10:01:21.000000000 +0100
++++ dspam-3.6.3/src/read_config.c	2006-01-25 10:07:44.391581250 +0100
 @@ -27,6 +27,7 @@
  #include <stdio.h>
  #include <errno.h>
@@ -26,7 +26,7 @@
  static char *next_normal_token(char **p)
  {
    char *start = *p;
-@@ -93,28 +97,66 @@
+@@ -93,28 +97,67 @@
    return NULL;
  }
  
@@ -60,6 +60,7 @@
 +      strcat(fulldir, "/");
 +      strcat(fulldir, dir_entry_p->d_name);
 +      num_root = fileread((const char *)fulldir, attrib, num_root);
++      free(fulldir);
 +    }
 +    closedir(dir_p);
 +  } else {
@@ -105,7 +106,7 @@
    }
  
    while(fgets(buffer, sizeof(buffer), file)!=NULL) {
-@@ -130,30 +172,48 @@
+@@ -130,30 +173,48 @@
        continue; /* Ignore whitespace-only lines */
  
      while ((v = tokenize(NULL, &bufptr)) != NULL) {