M       Makefile
M       distinfo
M       files/patch-BSDMakefile
D       files/patch-crypto.c
M       files/patch-dma-Makefile
M       files/patch-dma.c
D       files/patch-dma.h
A       files/patch-spool.c
Index: Makefile
===================================================================
--- Makefile	(revision 324870)
+++ Makefile	(working copy)
@@ -9,12 +9,11 @@
 #
 
 PORTNAME=		dma
-PORTVERSION=		v0.7
-PORTREVISION=		1
+PORTVERSION=		v0.9
 PORTEPOCH=		1
 CATEGORIES=		mail ipv6
 #MASTER_SITES=		https://github.com/		# 302 temp move
-MASTER_SITES=		https://nodeload.github.com/${GITHUB_USER}/${PORTNAME}/tarball/
+MASTER_SITES=		https://codeload.github.com/${GITHUB_USER}/${PORTNAME}/tar.gz/
 DISTNAME=		${PORTVERSION}
 EXTRACT_SUFX=
 DIST_SUBDIR=		${PORTNAME}
@@ -25,13 +24,14 @@ COMMENT=	DragonFly Mail Agent, a small MTA for loc
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-WRKSRC=		${WRKDIR}/${GITHUB_USER}-${PORTNAME}-${GITHUB_HASH}
+#WRKSRC=		${WRKDIR}/${GITHUB_USER}-${PORTNAME}-${GITHUB_HASH}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/v//1}
 
 USE_OPENSSL=	yes
 
 MAN8=		dma.8
 
-GITHUB_HASH=		db9a42b
+GITHUB_HASH=		2bb8bcb
 GITHUB_USER=		corecode
 
 CFLAGS+=	-I${OPENSSLINC} \
Index: distinfo
===================================================================
--- distinfo	(revision 324870)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (dma/v0.7) = 56a84a2a00b89f1abe6761657036a553aa9f1e9b0826abbace13609aea545e50
-SIZE (dma/v0.7) = 43961
+SHA256 (dma/v0.9) = 69a46b5a05b0be13ee547d675eed35010fe6c6aef10335e099de33a80983c262
+SIZE (dma/v0.9) = 45598
Index: files/patch-BSDMakefile
===================================================================
--- files/patch-BSDMakefile	(revision 324870)
+++ files/patch-BSDMakefile	(working copy)
@@ -1,6 +1,6 @@
---- BSDmakefile.orig	2012-01-03 13:54:05.000000000 +0000
-+++ BSDmakefile	2012-01-28 20:47:09.000000000 +0000
-@@ -1,20 +1,12 @@
+--- BSDmakefile.orig	2013-06-03 14:03:15.000000000 +0000
++++ BSDmakefile	2013-08-22 10:35:28.000000000 +0000
+@@ -1,21 +1,13 @@
  # $DragonFly: src/libexec/dma/Makefile,v 1.5 2008/09/19 00:36:57 corecode Exp $
  #
  
@@ -11,6 +11,7 @@
 +CFLAGS+= -I${.CURDIR} -I${.CURDIR}/..
  CFLAGS+= -DHAVE_REALLOCF -DHAVE_STRLCPY -DHAVE_GETPROGNAME
  CFLAGS+= -DLIBEXEC_PATH='"${LIBEXEC}"' -DDMA_VERSION='"${version}"'
+ CFLAGS+= -DCONF_PATH='"${CONFDIR}"'
  
 -DPADD=  ${LIBSSL} ${LIBCRYPTO}
 -LDADD=  -lssl -lcrypto
@@ -22,8 +23,8 @@
 -
  PREFIX?=	/usr/local
  LIBEXEC?=	${PREFIX}/libexec
- 
-@@ -23,4 +15,3 @@ BINGRP= mail
+ CONFDIR?=	${PREFIX}/etc/dma
+@@ -25,4 +17,3 @@ BINGRP= mail
  BINMODE=2555
  WARNS?=	6
  
Index: files/patch-crypto.c
===================================================================
--- files/patch-crypto.c	(revision 324870)
+++ files/patch-crypto.c	(working copy)
@@ -1,14 +0,0 @@
---- crypto.c.orig	2012-01-03 13:54:05.000000000 +0000
-+++ crypto.c	2012-03-06 23:50:42.000000000 +0000
-@@ -80,7 +80,11 @@ int
- smtp_init_crypto(int fd, int feature)
- {
- 	SSL_CTX *ctx = NULL;
-+#if (OPENSSL_VERSION_NUMBER >= 0x00909000L)
- 	const SSL_METHOD *meth = NULL;
-+#else
-+	SSL_METHOD *meth = NULL;
-+#endif
- 	X509 *cert;
- 	int error;
- 
Index: files/patch-dma-Makefile
===================================================================
--- files/patch-dma-Makefile	(revision 324870)
+++ files/patch-dma-Makefile	(working copy)
@@ -1,6 +1,6 @@
---- dma/Makefile.orig	2012-01-28 20:33:55.000000000 +0000
-+++ dma/Makefile	2012-01-28 20:33:55.608531000 +0000
-@@ -0,0 +1,14 @@
+--- dma/Makefile.orig	2013-08-22 10:56:28.000000000 +0000
++++ dma/Makefile	2013-08-22 11:18:05.000000000 +0000
+@@ -0,0 +1,17 @@
 +# $FreeBSD$
 +
 +.PATH:	${.CURDIR} ${.CURDIR}/../
@@ -10,8 +10,11 @@
 +SRCS+=	dma.c dns.c local.c mail.c net.c spool.c util.c
 +MAN=	dma.8
 +
++CFLAGS+= -DYY_NO_INPUT
 +DPADD=  ${LIBSSL} ${LIBCRYPTO}
 +LDADD=  -lssl -lcrypto
 +
++YFLAGS+=	-i
++
 +.include "../BSDmakefile"
 +.include <bsd.prog.mk>
Index: files/patch-dma.c
===================================================================
--- files/patch-dma.c	(revision 324870)
+++ files/patch-dma.c	(working copy)
@@ -1,6 +1,6 @@
---- dma.c.orig	2012-01-28 22:36:55.000000000 +0000
-+++ dma.c	2012-01-28 22:46:06.000000000 +0000
-@@ -332,7 +332,7 @@ retry:
+--- dma.c.orig	2013-08-22 10:56:28.000000000 +0000
++++ dma.c	2013-08-22 11:03:59.000000000 +0000
+@@ -343,7 +343,7 @@ retry:
  			exit(1);
  		}
  		if (gettimeofday(&now, NULL) == 0 &&
@@ -9,16 +9,16 @@
  			snprintf(errmsg, sizeof(errmsg),
  				 "Could not deliver for the last %d seconds. Giving up.",
  				 MAX_TIMEOUT);
-@@ -534,7 +535,7 @@ main(int argc, char **argv)
+@@ -560,7 +560,7 @@ main(int argc, char **argv)
  skipopts:
  	if (logident_base == NULL)
  		logident_base = "dma";
 -	setlogident(NULL);
-+	setlogident(logident_base);
++	setlogident("%s", logident_base);
  
  	act.sa_handler = sighup_handler;
  	act.sa_flags = 0;
-@@ -571,7 +572,7 @@ skipopts:
+@@ -598,7 +598,7 @@ skipopts:
  		errlog(1, "can not read aliases file `%s'", config.aliases);
  
  	if ((sender = set_from(&queue, sender)) == NULL)
@@ -26,4 +26,4 @@
 +		errlog(1, "set_from failed");
  
  	if (newspoolf(&queue) != 0)
- 		errlog(1, "can not create temp file");
+ 		errlog(1, "can not create temp file in `%s'", config.spooldir);
Index: files/patch-dma.h
===================================================================
--- files/patch-dma.h	(revision 324870)
+++ files/patch-dma.h	(working copy)
@@ -1,15 +0,0 @@
---- dma.h.orig	2012-01-03 13:54:05.000000000 +0000
-+++ dma.h	2012-01-28 11:02:57.000000000 +0000
-@@ -74,8 +75,12 @@
- #error Please define LIBEXEC_PATH
- #endif
- 
-+#ifndef DMA_ROOT_USER
- #define DMA_ROOT_USER	"mail"
-+#endif
-+#ifndef DMA_GROUP
- #define DMA_GROUP	"mail"
-+#endif
- 
- #ifndef MBOX_STRICT
- #define MBOX_STRICT	0
Index: files/patch-spool.c
===================================================================
--- files/patch-spool.c	(revision 0)
+++ files/patch-spool.c	(working copy)
@@ -0,0 +1,11 @@
+--- spool.c.orig	2013-06-03 14:03:15.000000000 +0000
++++ spool.c	2013-08-22 11:07:47.000000000 +0000
+@@ -415,7 +415,7 @@ flushqueue_since(unsigned int period)
+ 		return (0);
+ 
+ 	/* Did the flush file get touched within the last period seconds? */
+-	if (st.st_mtim.tv_sec + period >= now.tv_sec)
++	if (st.st_mtim.tv_sec + (int)period >= now.tv_sec)
+ 		return (1);
+ 	else
+ 		return (0);