Actually, we still need the 04-debian-setgid patch.

diff --git a/changelog b/changelog
index 29586eecefb2456e7bdd7ab11fe9be560034d1d3..4acf484d7d626f986e2982f44828f63eeb0d45be 100644 (file)
--- a/changelog
+++ b/changelog
@@ -6,7 +6,7 @@ dma (0.0.2010.06.17-1) UNRELEASED; urgency=low
       - remove the compatibility shims implemented upstream in a different way
     - in the 03-debian-locations patch, make the Debian defaults actual
       defaults for the dma binary, not just in the dma.conf file
-    - remove the 04-debian-setgid patch, using the GNU Makefile now
+    - adapt the 04-debian-setgid patch for the GNU Makefile
     - in the 10-liblockfile patch, change the GNU Makefile, not the BSD one
     - enhance the 11-double-bounce patch a bit:
       - use dma's own delqueue() function instead of a naive unlink() so

diff --git a/patches/04-debian-setgid.patch b/patches/04-debian-setgid.patch
new file mode 100644 (file)
index 0000000..5ffd6f3
--- /dev/null
+++ b/patches/04-debian-setgid.patch
@@ -0,0 +1,19 @@
+Description: Install the dma binary with the correct permissions.
+ The /usr/sbin/dma binary needs to run as set-group-id to properly access
+ its own mail queue.
+Origin: other: http://svn.ringlet.net/svn/ringlet/mail/dma/
+Forwarded: not-needed
+Author: Peter Pentchev <roam@ringlet.net>
+Last-Update: 2010-06-18
+
+--- a/Makefile.plain
++++ b/Makefile.plain
+@@ -30,7 +30,7 @@
+ install: all
+       ${INSTALL} -d ${DESTDIR}${SBIN} ${DESTDIR}${CONFDIR}
+       ${INSTALL} -d ${DESTDIR}${MAN}/man8
+-      ${INSTALL} -m 0755 dma ${DESTDIR}${SBIN}
++      ${INSTALL} -g mail -m 2755 dma ${DESTDIR}${SBIN}
+       ${INSTALL} -m 0644 dma.8 ${DESTDIR}${MAN}/man8/
+ 
+ aliases_parse.c: aliases_parse.y

diff --git a/patches/series b/patches/series
index 09c37058ce95496d44f980883619a67350e3359e..6fc138b41d27df68f9cde907f8df47d39d3e265d 100644 (file)
--- a/patches/series
+++ b/patches/series
@@ -1,5 +1,6 @@
 01-debian-build.patch
 03-debian-locations.patch
+04-debian-setgid.patch
 09-typos.patch
 10-liblockfile.patch
 11-double-bounce.patch