From owner-svn-ports-branches@freebsd.org Thu Oct 25 20:07:53 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 613A01086F50; Thu, 25 Oct 2018 20:07:53 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 17DCA70DEE; Thu, 25 Oct 2018 20:07:53 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ED23416AC9; Thu, 25 Oct 2018 20:07:52 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9PK7q2x019374; Thu, 25 Oct 2018 20:07:52 GMT (envelope-from crees@FreeBSD.org) Received: (from crees@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9PK7qh4019372; Thu, 25 Oct 2018 20:07:52 GMT (envelope-from crees@FreeBSD.org) Message-Id: <201810252007.w9PK7qh4019372@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: crees set sender to crees@FreeBSD.org using -f From: Chris Rees Date: Thu, 25 Oct 2018 20:07:52 +0000 (UTC) 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 X-SVN-Group: ports-branches X-SVN-Commit-Author: crees X-SVN-Commit-Paths: in branches/2018Q4/mail/mailscanner: . files X-SVN-Commit-Revision: 482990 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Oct 2018 20:07:53 -0000 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 +