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

[Matthijs Mohlmann]

Author: active2-guest
Date: Fri Jan 13 21:09:58 2006
New Revision: 66

Modified:
   trunk/debian/changelog
   trunk/debian/patches/add-config-dir.dpatch
Log:
 * New changelog entry.
 * Updated add-config-dir patch, return 0 instead of num_root when we get a
   "Permission denied" error (or some other errors why a file could not be
   opened somehow)


Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog	(original)
+++ trunk/debian/changelog	Fri Jan 13 21:09:58 2006
@@ -1,3 +1,15 @@
+dspam (3.6.2-3) experimental; urgency=low
+
+  * 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.
+  * 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)
+
+ -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>  Fri, 13 Jan 2006 21:53:47 +0100
+
 dspam (3.6.2-2) experimental; urgency=low
 
   * Add patch to fix ldap_verify bug

Modified: trunk/debian/patches/add-config-dir.dpatch
==============================================================================
--- trunk/debian/patches/add-config-dir.dpatch	(original)
+++ trunk/debian/patches/add-config-dir.dpatch	Fri Jan 13 21:09:58 2006
@@ -5,9 +5,9 @@
 ## DP: Add config item include that include directories.
 
 @DPATCH@
-diff -urNad dspam-3.6.0~/src/read_config.c dspam-3.6.0/src/read_config.c
---- dspam-3.6.0~/src/read_config.c	2005-11-10 14:52:01.000000000 +0100
-+++ dspam-3.6.0/src/read_config.c	2005-11-10 14:52:51.420078750 +0100
+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 19:51:46.000000000 +0100
++++ dspam-3.6.2/src/read_config.c	2006-01-13 19:53:12.136133750 +0100
 @@ -27,6 +27,7 @@
  #include <stdio.h>
  #include <errno.h>
@@ -96,7 +96,7 @@
 -    free(attrib);
 -    return NULL;
 +    free(*attrib);
-+    return num_root;
++    return 0;
    }
  
    while(fgets(buffer, sizeof(buffer), file)!=NULL) {