make dma compile again on DragonFly

Pointed-out-by:  Robin Green <greenrd@greenrd.org>

diff --git a/BSDmakefile b/BSDmakefile
index 051f5642d7c01c4dd31abf3ec209e25087159a4e..9042c8c082ee5c40f9750d170159d17ab7976944 100644 (file)
--- a/BSDmakefile
+++ b/BSDmakefile
@@ -1,8 +1,11 @@
 # $DragonFly: src/libexec/dma/Makefile,v 1.5 2008/09/19 00:36:57 corecode Exp $
 #
 
+version!=      sh get-version.sh
+
 CFLAGS+= -I${.CURDIR}
 CFLAGS+= -DHAVE_REALLOCF -DHAVE_STRLCPY -DHAVE_GETPROGNAME
+CFLAGS+= -DLIBEXEC_PATH='"${LIBEXEC}"' -DDMA_VERSION='"${version}"'
 
 DPADD=  ${LIBSSL} ${LIBCRYPTO}
 LDADD=  -lssl -lcrypto
@@ -12,6 +15,9 @@ SRCS= aliases_parse.y aliases_scan.l base64.c conf.c crypto.c
 SRCS+= dma.c dns.c local.c mail.c net.c spool.c util.c
 MAN=   dma.8
 
+PREFIX?=       /usr/local
+LIBEXEC?=      ${PREFIX}/libexec
+
 BINOWN= root
 BINGRP= mail
 BINMODE=2555

diff --git a/local.c b/local.c
index fd816ddfd86963427befcb3dfa593af2d20f8fba..694dd845766a02827fdecf7ac1e9c21863d1c0e3 100644 (file)
--- a/local.c
+++ b/local.c
@@ -40,6 +40,7 @@
 #include <fcntl.h>
 #include <limits.h>
 #include <paths.h>
+#include <signal.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <syslog.h>

diff --git a/mail.c b/mail.c
index 041ebe4827a2a0ee027c5e7d49cfc0d711b0ce3e..398443986b0b3831ea8fcd53ee948adcddbc789e 100644 (file)
--- a/mail.c
+++ b/mail.c
@@ -424,7 +424,7 @@ readmail(struct queue *queue, int nodot, int recp_from_header)
                                        snprintf(line, sizeof(line), "Message-Id: <%"PRIxMAX".%s.%"PRIxMAX"@%s>\n",
                                                 (uintmax_t)time(NULL),
                                                 queue->id,
-                                                random(),
+                                                (uintmax_t)random(),
                                                 hostname());
                                } else if (!had_from) {
                                        had_from = 1;

diff --git a/util.c b/util.c
index b32919d14e762fe94e2dccac3b83ef04e5c20594..a139b20d383166db75fd48f722f506509942f96f 100644 (file)
--- a/util.c
+++ b/util.c
@@ -51,6 +51,9 @@
 const char *
 hostname(void)
 {
+#ifndef HOST_NAME_MAX
+#define HOST_NAME_MAX  255
+#endif
        static char name[HOST_NAME_MAX+1];
        static int initialized = 0;
        char *s;