From: Simon Schubert <2@0x2c.org> Date: Thu, 28 Oct 2010 20:55:36 +0000 (+0200) Subject: drop 23-dirent-d_type.patch: better solution already in place X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27d37dde7f3682d3f849aa51501ff507a4f3c260;p=people%2Fms%2Fdma.git drop 23-dirent-d_type.patch: better solution already in place --- diff --git a/debian/patches/23-dirent-d_type.patch b/debian/patches/23-dirent-d_type.patch deleted file mode 100644 index 379765a..0000000 --- a/debian/patches/23-dirent-d_type.patch +++ /dev/null @@ -1,31 +0,0 @@ -Description: Allow the spool to be on a filesystem that does not set d_type. - Some filesystems (notably XFS) do not set the d_type field in the dirent - structure. This prevents dma from delivering any of the queued messages. -Origin: other: http://svn.ringlet.net/svn/ringlet/mail/dma/ -Bug-Debian: http://bugs.debian.org/544357 -Forwarded: yes -Author: Peter Pentchev -Last-Update: 2010-06-21 - ---- a/spool.c -+++ b/spool.c -@@ -291,7 +291,8 @@ - mailfn = NULL; - - /* ignore temp files */ -- if (strncmp(de->d_name, "tmp_", 4) == 0 || de->d_type != DT_REG) -+ if (strncmp(de->d_name, "tmp_", 4) == 0 || -+ (de->d_type != DT_REG && de->d_type != DT_UNKNOWN)) - continue; - if (de->d_name[0] != 'Q') - continue; -@@ -300,6 +301,9 @@ - if (asprintf(&mailfn, "%s/M%s", config.spooldir, de->d_name + 1) < 0) - goto fail; - -+ if (de->d_type == DT_UNKNOWN) -+ if (stat(queuefn, &sb) == -1 || !S_ISREG(sb.st_mode)) -+ goto skip_item; - if (stat(mailfn, &sb) != 0) - goto skip_item; -