Date: Thu, 25 Oct 2018 20:07:52 +0000 (UTC) From: Chris Rees <crees@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r482990 - in branches/2018Q4/mail/mailscanner: . files Message-ID: <201810252007.w9PK7qh4019372@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: crees Date: Thu Oct 25 20:07:52 2018 New Revision: 482990 URL: https://svnweb.freebsd.org/changeset/ports/482990 Log: Backport fix from upstream: Fix mktemp on FreeBSD11 Approved by: portmgr (implicit, runtime fix) Obtained from: https://github.com/MailScanner/v5/commit/cf1c30 Added: branches/2018Q4/mail/mailscanner/files/patch-cf1c302 (contents, props changed) Modified: branches/2018Q4/mail/mailscanner/Makefile Modified: branches/2018Q4/mail/mailscanner/Makefile ============================================================================== --- branches/2018Q4/mail/mailscanner/Makefile Thu Oct 25 19:47:02 2018 (r482989) +++ branches/2018Q4/mail/mailscanner/Makefile Thu Oct 25 20:07:52 2018 (r482990) @@ -3,6 +3,7 @@ PORTNAME= MailScanner PORTVERSION= 5.1.1 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= https://s3.amazonaws.com/msv5/release/ DISTNAME= ${PORTNAME}-${PORTVERSION}-${PATCHLEVEL}.nix Added: branches/2018Q4/mail/mailscanner/files/patch-cf1c302 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/mail/mailscanner/files/patch-cf1c302 Thu Oct 25 20:07:52 2018 (r482990) @@ -0,0 +1,35 @@ +diff --git a/usr/lib/MailScanner/wrapper/clamav-wrapper b/usr/lib/MailScanner/wrapper/clamav-wrapper +index 210482b..7a5dca4 100644 +--- usr/lib/MailScanner/wrapper/clamav-wrapper ++++ usr/lib/MailScanner/wrapper/clamav-wrapper +@@ -24,6 +24,9 @@ + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + # + ++#OS Name ++OSType=`/usr/bin/env uname -s` ++ + # this passed from the CLI + # ./scanner-wrapper /path/to/av/bin /thing/to/scan + ClamScan=$1/bin/clamscan +@@ -144,7 +147,11 @@ fi + [ -d ${IWD} ] || mkdir -p ${IWD} + + # create our working tmp directory in the base tmp directory +-TempDir=`mktemp -d --tmpdir=${IWD}` ++if [ "${OSType}" = "FreeBSD" ]; then ++ TempDir=`TMPDIR=${IWD} mktemp -d` ++else ++ TempDir=`mktemp -d --tmpdir=${IWD}` ++fi + + # In case we get interupted.... + trap "rm -rf ${TempDir}" EXIT +@@ -179,4 +186,4 @@ if [ -d ${TempDir} ]; then + rm -rf ${TempDir} + fi + +-exit $retval +\ No newline at end of file ++exit $retval +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810252007.w9PK7qh4019372>