Index: head/mail/dma/Makefile =================================================================== --- head/mail/dma/Makefile (revision 564952) +++ head/mail/dma/Makefile (revision 564953) @@ -1,57 +1,57 @@ # Created by: Daniel Roethlisberger # $FreeBSD$ PORTNAME= dma PORTVERSION= 0.13 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= mail MAINTAINER= garga@FreeBSD.org COMMENT= DragonFly Mail Agent, a small MTA for local/outbound mail LICENSE= BSD3CLAUSE USES= uidfix ssl USE_GITHUB= yes GH_ACCOUNT= corecode BUILD_WRKSRC= ${WRKSRC}/bsd INSTALL_WRKSRC= ${WRKSRC}/bsd CFLAGS+= -I${OPENSSLINC} \ -DCONF_PATH='\"${PREFIX}/etc/dma\"' \ -DDMA_ROOT_USER='\"mailnull\"' \ -DDMA_GROUP='\"mail\"' LDFLAGS+= -L${OPENSSLLIB} MAKE_ENV= __MAKE_CONF=/dev/null SRCCONF=/dev/null MK_WERROR=no \ MANDIR=${PREFIX}/share/man/man USE_RC_SUBR= dma_flushq SUB_FILES= pkg-message # Allow subports to extend. CONFFILES+= dma.conf auth.conf # 11.x has dma imported into base and /var/spool/dma added to mtree PLIST_SUB+= VARDIR="@comment " PORTSCOUT= limit:^[0-9\.]*$$ post-patch: @${REINPLACE_CMD} -e 's,/etc/dma,${PREFIX}/etc/dma,g' \ ${WRKSRC}/dma.8 @${REINPLACE_CMD} -e 's, /etc/dma, ${PREFIX}/etc/dma,g' \ ${WRKSRC}/dma.conf @${REINPLACE_CMD} -e '/^MK_MAN/d' -e 's/^NOMAN.*/MAN=/' \ ${WRKSRC}/bsd/dma-mbox-create/Makefile post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${MKDIR} ${STAGEDIR}/var/spool/dma ${INSTALL_DATA} ${WRKSRC}/dma.conf ${STAGEDIR}${ETCDIR}/dma.conf.sample ${INSTALL_DATA} ${WRKSRC}/auth.conf ${STAGEDIR}${ETCDIR}/auth.conf.sample .include Index: head/mail/dma/files/patch-crypto.c =================================================================== --- head/mail/dma/files/patch-crypto.c (nonexistent) +++ head/mail/dma/files/patch-crypto.c (revision 564953) @@ -0,0 +1,11 @@ +--- crypto.c.orig 2021-02-11 13:53:38 UTC ++++ crypto.c +@@ -78,7 +78,7 @@ init_cert_file(SSL_CTX *ctx, const char *path) + return (0); + } + +-int ++static int + verify_server_fingerprint(const X509 *cert) + { + unsigned char fingerprint[EVP_MAX_MD_SIZE] = {0}; Property changes on: head/mail/dma/files/patch-crypto.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/dma/files/patch-dma.c =================================================================== --- head/mail/dma/files/patch-dma.c (revision 564952) +++ head/mail/dma/files/patch-dma.c (revision 564953) @@ -1,29 +1,29 @@ ---- dma.c.orig 2016-02-07 12:41:49 UTC +--- dma.c.orig 2020-02-05 10:59:09 UTC +++ dma.c -@@ -340,7 +340,7 @@ retry: +@@ -341,7 +341,7 @@ retry: exit(EX_SOFTWARE); } if (gettimeofday(&now, NULL) == 0 && - (now.tv_sec - st.st_mtim.tv_sec > MAX_TIMEOUT)) { + (now.tv_sec - st.st_mtime > MAX_TIMEOUT)) { snprintf(errmsg, sizeof(errmsg), "Could not deliver for the last %d seconds. Giving up.", MAX_TIMEOUT); -@@ -564,7 +564,7 @@ main(int argc, char **argv) +@@ -565,7 +565,7 @@ main(int argc, char **argv) skipopts: if (logident_base == NULL) logident_base = "dma"; - setlogident(NULL); + setlogident("%s", logident_base); act.sa_handler = sighup_handler; act.sa_flags = 0; -@@ -596,7 +596,7 @@ skipopts: +@@ -597,7 +597,7 @@ skipopts: errlog(EX_SOFTWARE, "could not parse aliases file `%s'", config.aliases); if ((sender = set_from(&queue, sender)) == NULL) - errlog(EX_SOFTWARE, NULL); + errlog(EX_SOFTWARE, "set_from failed"); if (newspoolf(&queue) != 0) errlog(EX_CANTCREAT, "can not create temp file in `%s'", config.spooldir); Index: head/mail/dma/files/patch-mail.c =================================================================== --- head/mail/dma/files/patch-mail.c (revision 564952) +++ head/mail/dma/files/patch-mail.c (revision 564953) @@ -1,11 +1,11 @@ ---- mail.c.orig 2016-02-07 12:41:49 UTC +--- mail.c.orig 2020-02-05 10:59:09 UTC +++ mail.c -@@ -333,7 +333,7 @@ newaddr: +@@ -335,7 +335,7 @@ newaddr: ps->pos = 0; addr = strdup(ps->addr); if (addr == NULL) - errlog(EX_SOFTWARE, NULL); + errlog(EX_SOFTWARE, "strdup failed"); if (add_recp(queue, addr, EXPAND_WILDCARD) != 0) errlogx(EX_DATAERR, "invalid recipient `%s'", addr); Index: head/mail/dma/files/patch-spool.c =================================================================== --- head/mail/dma/files/patch-spool.c (revision 564952) +++ head/mail/dma/files/patch-spool.c (revision 564953) @@ -1,11 +1,11 @@ ---- spool.c.orig 2016-02-07 12:41:49 UTC +--- spool.c.orig 2020-02-05 10:59:09 UTC +++ spool.c -@@ -416,7 +416,7 @@ flushqueue_since(unsigned int period) +@@ -419,7 +419,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);