From owner-svn-ports-all@freebsd.org Sun Dec 27 15:49:03 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E6351A5372C; Sun, 27 Dec 2015 15:49:02 +0000 (UTC) (envelope-from junovitch@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 mx1.freebsd.org (Postfix) with ESMTPS id A552917D1; Sun, 27 Dec 2015 15:49:02 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBRFn1ql098674; Sun, 27 Dec 2015 15:49:01 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBRFn12a098671; Sun, 27 Dec 2015 15:49:01 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201512271549.tBRFn12a098671@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Sun, 27 Dec 2015 15:49:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r404578 - in head/security/amavisd-milter: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Dec 2015 15:49:03 -0000 Author: junovitch Date: Sun Dec 27 15:49:01 2015 New Revision: 404578 URL: https://svnweb.freebsd.org/changeset/ports/404578 Log: security/amavisd-milter: resolve runtime bug with temp directory handling - Use ${AMAVISDIR}/tmp as working directory to resolve runtime bug: Failure: Suspicious temporary directory name '/var/run/amavis/tmp/afcokTMBJlIs' PR: 204787 Submitted by: Geoffroy Desvernay Approved by: Petr Rehor (maintainer) MFH: 2015Q4 Modified: head/security/amavisd-milter/Makefile head/security/amavisd-milter/files/amavisd-milter.in head/security/amavisd-milter/pkg-plist Modified: head/security/amavisd-milter/Makefile ============================================================================== --- head/security/amavisd-milter/Makefile Sun Dec 27 15:43:36 2015 (r404577) +++ head/security/amavisd-milter/Makefile Sun Dec 27 15:49:01 2015 (r404578) @@ -3,7 +3,7 @@ PORTNAME= amavisd-milter PORTVERSION= 1.6.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security mail MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -31,7 +31,7 @@ AMAVISDIR?= /var/amavis RUNDIR= /var/run/amavis GNU_CONFIGURE= yes -CONFIGURE_ARGS= --localstatedir=${RUNDIR} --with-working-dir=tmp +CONFIGURE_ARGS= --localstatedir=${RUNDIR} --with-working-dir=${AMAVISDIR}/tmp USE_RC_SUBR= ${PORTNAME} SUB_LIST= AMAVISUSER=${AMAVISUSER} \ @@ -64,6 +64,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor ${INSTALL} -d -o ${AMAVISUSER} -g ${AMAVISGROUP} -m 755 ${STAGEDIR}${RUNDIR} - ${INSTALL} -d -o ${AMAVISUSER} -g ${AMAVISGROUP} -m 750 ${STAGEDIR}${RUNDIR}/tmp .include Modified: head/security/amavisd-milter/files/amavisd-milter.in ============================================================================== --- head/security/amavisd-milter/files/amavisd-milter.in Sun Dec 27 15:43:36 2015 (r404577) +++ head/security/amavisd-milter/files/amavisd-milter.in Sun Dec 27 15:49:01 2015 (r404578) @@ -37,7 +37,9 @@ start_postcmd="amavisd_milter_postcmd" amavisd_milter_postcmd() { - chmod ${amavisd_milter_socket_perm} ${amavisd_milter_socket} + if [ -e ${amavisd_milter_socket} ]; then + chmod ${amavisd_milter_socket_perm} ${amavisd_milter_socket} + fi } run_rc_command "$1" Modified: head/security/amavisd-milter/pkg-plist ============================================================================== --- head/security/amavisd-milter/pkg-plist Sun Dec 27 15:43:36 2015 (r404577) +++ head/security/amavisd-milter/pkg-plist Sun Dec 27 15:49:01 2015 (r404578) @@ -1,4 +1,3 @@ sbin/amavisd-milter man/man8/amavisd-milter.8.gz -@dir(%%AMAVISUSER%%,%%AMAVISGROUP%%,750) %%RUNDIR%%/tmp @dir(%%AMAVISUSER%%,%%AMAVISGROUP%%,755) %%RUNDIR%%