diff options
author | garga <garga@FreeBSD.org> | 2008-08-19 02:44:19 +0800 |
---|---|---|
committer | garga <garga@FreeBSD.org> | 2008-08-19 02:44:19 +0800 |
commit | 60e161029c228949369b534327c61e1751a74c5e (patch) | |
tree | bd8f68c3d4473cc113b99638799d8125ed384be2 /security/clamav | |
parent | 83a4e105fc4edf74df38d29cda58bfc5999fbf68 (diff) | |
download | freebsd-ports-graphics-60e161029c228949369b534327c61e1751a74c5e.tar.gz freebsd-ports-graphics-60e161029c228949369b534327c61e1751a74c5e.tar.zst freebsd-ports-graphics-60e161029c228949369b534327c61e1751a74c5e.zip |
- Permit to ser owner and group to clamav milter socket [1]
- Remove @ to show some install commands, and add -v to cp
- Install clamav-milter doc
- User CHOWN and CHMOD from bsd.commands.mk
PR: ports/126069 [1]
Submitted by: Matthew D. Fuller <fullermd@over-yonder.net> [1]
Diffstat (limited to 'security/clamav')
-rw-r--r-- | security/clamav/Makefile | 15 | ||||
-rw-r--r-- | security/clamav/files/clamav-milter.in | 5 |
2 files changed, 14 insertions, 6 deletions
diff --git a/security/clamav/Makefile b/security/clamav/Makefile index 9b9000dbb53..47283034bec 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -83,7 +83,9 @@ SUB_LIST+= DBDIR=${DBDIR} \ CLAMAVUSER=${CLAMAVUSER} \ CLAMAVGROUP=${CLAMAVGROUP} \ CLAMAV_CLAMD_SOCKET=${CLAMAV_CLAMD_SOCKET} \ - CLAMAV_MILTER_SOCKET=${CLAMAV_MILTER_SOCKET} + CLAMAV_MILTER_SOCKET=${CLAMAV_MILTER_SOCKET} \ + CHMOD=${CHMOD} \ + CHOWN=${CHOWN} SED_CONF= -E -e 's|^\#?(Example)$$|\#\1|' \ -e 's|^\#?((Update)?LogFile) .*/([a-z]+\.log)$$|\1 ${LOGDIR}/\3|' \ @@ -170,15 +172,18 @@ pre-install: @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: - @${INSTALL_DATA} ${WRKSRC}/clamav-config.h ${PREFIX}/include + ${INSTALL_DATA} ${WRKSRC}/clamav-config.h ${PREFIX}/include .for c in clamd freshclam @[ -f ${PREFIX}/etc/${c}.conf ] || \ - ${CP} ${PREFIX}/etc/${c}.conf.default ${PREFIX}/etc/${c}.conf + ${CP} -v ${PREFIX}/etc/${c}.conf.default ${PREFIX}/etc/${c}.conf .endfor .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR}/html - @${INSTALL_DATA} ${WRKSRC}/NEWS ${WRKSRC}/ChangeLog ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/docs/html/* ${DOCSDIR}/html + ${INSTALL_DATA} ${WRKSRC}/NEWS ${WRKSRC}/ChangeLog ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/html/* ${DOCSDIR}/html +. if defined(WITH_MILTER) + ${INSTALL_DATA} ${WRKSRC}/clamav-milter/INSTALL ${DOCSDIR}/INSTALL.clamav-milter +. endif .endif @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL diff --git a/security/clamav/files/clamav-milter.in b/security/clamav/files/clamav-milter.in index 1ea9c1a74bf..cb467c53f33 100644 --- a/security/clamav/files/clamav-milter.in +++ b/security/clamav/files/clamav-milter.in @@ -84,7 +84,8 @@ start_postcmd() echo "There is no clamav-milter socket (${clamav_milter_socket})!" exit 1 fi - /bin/chmod ${clamav_milter_socket_mode} ${clamav_milter_socket} + %%CHMOD%% ${clamav_milter_socket_mode} ${clamav_milter_socket} + %%CHOWN%% ${clamav_milter_socket_user}:${clamav_milter_socket_group} ${clamav_milter_socket} fi } @@ -95,6 +96,8 @@ load_rc_config $name : ${clamav_milter_flags="--postmaster-only --local --outgoing --timeout=0 --max-children=50"} : ${clamav_milter_socktimeout="60"} : ${clamav_milter_socket_mode="755"} +: ${clamav_milter_socket_user="%%CLAMAVUSER%%"} +: ${clamav_milter_socket_group="%%CLAMAVGROUP%%"} : ${clamav_clamd_socket="%%CLAMAV_CLAMD_SOCKET%%"} : ${clamav_clamd_enable="NO"} |