Index: head/mail/dma/Makefile =================================================================== --- head/mail/dma/Makefile (revision 509525) +++ head/mail/dma/Makefile (revision 509526) @@ -1,56 +1,54 @@ # Created by: Daniel Roethlisberger # $FreeBSD$ PORTNAME= dma -PORTVERSION= 0.11 +PORTVERSION= 0.12 DISTVERSIONPREFIX= v -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= mail ipv6 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 NO_WERROR=defined \ MANDIR=${MANDIRS}/man USE_RC_SUBR= dma_flushq SUB_FILES= pkg-message -EXTRA_PATCHES= ${FILESDIR}/fix-security-hole.patch:-p1 # 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 " 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/NO_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/distinfo =================================================================== --- head/mail/dma/distinfo (revision 509525) +++ head/mail/dma/distinfo (revision 509526) @@ -1,2 +1,3 @@ -SHA256 (corecode-dma-v0.11_GH0.tar.gz) = 288bd57f17aba696b6423b1fa0cd0f7d9b7228d32811f1cd7b821d5f020051b8 -SIZE (corecode-dma-v0.11_GH0.tar.gz) = 34529 +TIMESTAMP = 1566415052 +SHA256 (corecode-dma-v0.12_GH0.tar.gz) = 054a40203d43bc1182dcadf2375ccf01944329dce472444acb42d56cf01de367 +SIZE (corecode-dma-v0.12_GH0.tar.gz) = 35603 Index: head/mail/dma/files/fix-security-hole.patch =================================================================== --- head/mail/dma/files/fix-security-hole.patch (revision 509525) +++ head/mail/dma/files/fix-security-hole.patch (nonexistent) @@ -1,34 +0,0 @@ -From f249aa412dd4a09881cb450390d1003815bd0013 Mon Sep 17 00:00:00 2001 -From: Zach Crownover -Date: Fri, 5 Aug 2016 15:24:27 -0700 -Subject: [PATCH] dma - Fix security hole (#46) - -Affecting DragonFly 4.6 and earlier, Matt Dillon fixed this in base after -finding out from BSDNow Episode 152. Comments following were from his commit -which explains better than I. Just taking his change and putting it here as well. - -* dma makes an age-old mistake of not properly checking whether a file - owned by a user is a symlink or not, a bug which the original mail.local - also had. - -* Add O_NOFOLLOW to disallow symlinks. - -Thanks-to: BSDNow Episode 152, made me dive dma to check when they talked - about the mail.local bug. ---- - dma-mbox-create.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dma-mbox-create.c b/dma-mbox-create.c -index 532a7af..45a4792 100644 ---- a/dma-mbox-create.c -+++ b/dma-mbox-create.c -@@ -142,7 +142,7 @@ main(int argc, char **argv) - logfail(EX_CANTCREAT, "cannot build mbox path for `%s/%s'", _PATH_MAILDIR, user); - } - -- f = open(fn, O_RDONLY|O_CREAT, 0600); -+ f = open(fn, O_RDONLY|O_CREAT|O_NOFOLLOW, 0600); - if (f < 0) - logfail(EX_NOINPUT, "cannt open mbox `%s'", fn); - Property changes on: head/mail/dma/files/fix-security-hole.patch ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property