Just for kicks, patch the BSD Makefile, too (branches/debian/ rev. 5071).

diff --git a/changelog b/changelog
index ed072be072afbf2834b8cfdd4841c049bfa72c37..b607f74f840a25e7dea29b3211056e60a8740bd0 100644 (file)
--- a/changelog
+++ b/changelog
@@ -9,7 +9,7 @@ dma (0.0.2010.06.17-1) unstable; urgency=low
     - in the 03-debian-locations patch, make the Debian defaults actual
       defaults for the dma binary, not just in the dma.conf file
     - adapt the 04-debian-setgid patch for the GNU Makefile
-    - in the 10-liblockfile patch, change the GNU Makefile, not the BSD one
+    - in the 10-liblockfile patch, change the GNU Makefile, too
     - enhance the 11-double-bounce patch a bit:
       - use dma's own delqueue() function instead of a naive unlink() so
         all the queue files are cleaned up
@@ -19,8 +19,7 @@ dma (0.0.2010.06.17-1) unstable; urgency=low
     - remove the 20-parse-recipient patch, implemented upstream in
       a different way
     - remove the 22-openfiles patch, overtaken by upstream changes
-    - in the 24-random-message-id patch, change the GNU Makefile,
-      not the BSD one
+    - in the 24-random-message-id patch, change the GNU Makefile, too
     - add the 27-int-size patch to cast a variable to the correct type
     - add the 28-valid-recipient patch to fix parsing recipients out of
       the message body

diff --git a/patches/10-liblockfile.patch b/patches/10-liblockfile.patch
index 76c020ba5b70c50caf84cf37f3fb660ec3f0af10..e9542a36ef44cfe48e1d34eb796c589d0a52ebc4 100644 (file)
--- a/patches/10-liblockfile.patch
+++ b/patches/10-liblockfile.patch
@@ -2,7 +2,7 @@ Description: Dot-lock the user's mailbox with maillock(3) from liblockfile.
 Origin: other: http://svn.ringlet.net/svn/ringlet/mail/dma/
 Forwarded: not-needed
 Author: Peter Pentchev <roam@ringlet.net>
-Last-Update: 2010-06-18
+Last-Update: 2010-06-21
 
 --- a/local.c
 +++ b/local.c
@@ -170,3 +170,19 @@ Last-Update: 2010-06-18
  
  INSTALL?=     install -p
  PREFIX?=      /usr/local
+--- a/Makefile
++++ b/Makefile
+@@ -1,10 +1,11 @@
+ # $DragonFly: src/libexec/dma/Makefile,v 1.5 2008/09/19 00:36:57 corecode Exp $
+ #
+ 
++CFLAGS+= -DHAVE_LIBLOCKFILE
+ CFLAGS+= -I${.CURDIR}
+ 
+-DPADD=  ${LIBSSL} ${LIBCRYPTO}
+-LDADD=  -lssl -lcrypto
++DPADD=  ${LIBSSL} ${LIBCRYPTO} /usr/lib/liblockfile.a
++LDADD=  -lssl -lcrypto -llockfile
+ 
+ PROG= dma
+ SRCS= aliases_parse.y aliases_scan.l base64.c conf.c crypto.c

diff --git a/patches/24-random-message-id.patch b/patches/24-random-message-id.patch
index 84e08938a600cfb2ce63463f8b19b2498e865559..7b97ba5a83ba074f875d576a0593d8de477e0a09 100644 (file)
--- a/patches/24-random-message-id.patch
+++ b/patches/24-random-message-id.patch
@@ -4,7 +4,7 @@ Origin: other: http://svn.ringlet.net/svn/ringlet/mail/dma/
 Bug-Debian: http://bugs.debian.org/544475
 Forwarded: no
 Author: Peter Pentchev <roam@ringlet.net>
-Last-Update: 2010-06-18
+Last-Update: 2010-06-21
 
 --- a/dma.c
 +++ b/dma.c
@@ -62,3 +62,14 @@ Last-Update: 2010-06-18
  CFLAGS+=      -DHAVE_LIBLOCKFILE
  
  INSTALL?=     install -p
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ # $DragonFly: src/libexec/dma/Makefile,v 1.5 2008/09/19 00:36:57 corecode Exp $
+ #
+ 
+-CFLAGS+= -DHAVE_LIBLOCKFILE
++CFLAGS+= -DHAVE_RANDOM -DHAVE_SRANDOM -DHAVE_LIBLOCKFILE
+ CFLAGS+= -I${.CURDIR}
+ 
+ DPADD=  ${LIBSSL} ${LIBCRYPTO} /usr/lib/liblockfile.a