Date: Sun, 27 Dec 2015 15:49:01 +0000 (UTC) From: Jason Unovitch <junovitch@FreeBSD.org> 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 Message-ID: <201512271549.tBRFn12a098671@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <dgeo@centrale-marseille.fr> Approved by: Petr Rehor <rx@rx.cz> (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 <bsd.port.post.mk> 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%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512271549.tBRFn12a098671>