Merge trunk rev. 5014: use dma's delqueue() so all queue files are removed.

diff --git a/changelog b/changelog
index 450a95d19b431a3aee0ab36535264a20794715fc..8eab598bbdca767c820fd55f70661fa5ecd08876 100644 (file)
--- a/changelog
+++ b/changelog
@@ -16,6 +16,8 @@ dma (0.0.2009.08.29-1) UNRELEASED; urgency=low
     - refresh 01-debian-build, 03-debian-locations, 04-debian-setgid,
       09-typos, 10-liblockfile, 11-double-bounce, 17-mailname,
       23-dirent-d_type, 24-random-message-id, and 25-unsupported-starttls
+    - in the 11-double-bounce patch, use dma's own delqueue() function
+      instead of a naive unlink() so all the queue files are cleaned up
   * Bump Standards-Version to 3.8.4 with no changes.
   * Bring the copyright file up to the latest revision of the DEP 5
     proposed format and bump the year on my copyright notice.

diff --git a/patches/11-double-bounce.patch b/patches/11-double-bounce.patch
index b25f8056112f063e24894f55fb8758be5095ac8e..9094ac4fb8bc6a9489cec05adf7133068748fb33 100644 (file)
--- a/patches/11-double-bounce.patch
+++ b/patches/11-double-bounce.patch
@@ -8,7 +8,7 @@ Description: Implement double-bounce handling via an external program.
 Origin: other: http://svn.ringlet.net/svn/ringlet/mail/dma/
 Bug: http://bugs.dragonflybsd.org/issue1321
 Author: Peter Pentchev <roam@ringlet.net>
-Last-Update: 2010-06-02
+Last-Update: 2010-06-17
 
 --- a/conf.c
 +++ b/conf.c
@@ -92,7 +92,7 @@ Last-Update: 2010-06-02
  #include <syslog.h>
  #include <unistd.h>
  
-@@ -43,13 +48,115 @@
+@@ -43,13 +48,114 @@
  {
        struct queue bounceq;
        char line[1000];
@@ -205,8 +205,7 @@ Last-Update: 2010-06-02
 +              }
 +              syslog(LOG_ERR, "%s: double-bounce succeeded, message passed to handler `%s': %s",
 +                     it->queueid, config->dbounceprog, buf);
-+              unlink(it->queuefn);
-+              fclose(it->queuef);
++              delqueue(it);
 +              exit(0);
        }