diff options
| -rw-r--r-- | security/clamav/Makefile | 15 | ||||
| -rw-r--r-- | security/clamav/files/clamav-milter.in | 7 | ||||
| -rw-r--r-- | security/clamav/pkg-plist | 16 |
3 files changed, 24 insertions, 14 deletions
diff --git a/security/clamav/Makefile b/security/clamav/Makefile index 0174285ce6b0..cbfa2ac38212 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -7,6 +7,7 @@ PORTNAME= clamav PORTVERSION= 0.93 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= SF @@ -68,7 +69,7 @@ CONFLICTS= clamav-devel-[0-9]* CLAMAVUSER?= clamav CLAMAVGROUP?= clamav -CLAMAV_CLAMD_SOCKET?= ${RUNDIR}/clamd +CLAMAV_CLAMD_SOCKET?= ${RUNDIR}/clamd.sock CLAMAV_MILTER_SOCKET?= ${RUNDIR}/clmilter.sock SUB_FILES= pkg-install pkg-deinstall @@ -138,16 +139,18 @@ CONFIGURE_ARGS+=--without-iconv .if defined(WITH_MILTER) USE_RC_SUBR+= clamav-milter -.if defined(WITH_LDAP) && exists(${LOCALBASE}/lib/libldap.so) +. if defined(WITH_LDAP) && exists(${LOCALBASE}/lib/libldap.so) USE_OPENLDAP= yes LDFLAGS+= -lldap -.endif -.if !exists(/usr/lib/libmilter.a) || exists(${LOCALBASE}/lib/libmilter.a) +. endif + +. if !exists(/usr/lib/libmilter.a) || exists(${LOCALBASE}/lib/libmilter.a) BUILD_DEPENDS+= ${LOCALBASE}/lib/libmilter.a:${PORTSDIR}/mail/sendmail CONFIGURE_ARGS+= --with-sendmail=${LOCALBASE}/sbin/sendmail -.else +. else CONFIGURE_ARGS+= --with-sendmail=/usr/sbin/sendmail -.endif +. endif + CONFIGURE_ARGS+= --enable-milter PLIST_SUB+= CLAMAV-MILTER="" .else diff --git a/security/clamav/files/clamav-milter.in b/security/clamav/files/clamav-milter.in index 90a3f2bf8c2e..509d05e3d42c 100644 --- a/security/clamav/files/clamav-milter.in +++ b/security/clamav/files/clamav-milter.in @@ -27,6 +27,7 @@ required_dirs=%%DBDIR%% required_files=%%PREFIX%%/etc/clamd.conf start_precmd=start_precmd +start_postcmd=start_postcmd start_precmd() { @@ -56,12 +57,18 @@ start_precmd() fi } +start_postcmd() +{ + /bin/chmod ${clamav_milter_socket_mode} ${clamav_milter_socket} +} + # read settings, set default values load_rc_config $name : ${clamav_milter_enable="NO"} : ${clamav_milter_socket="%%CLAMAV_MILTER_SOCKET%%"} : ${clamav_milter_flags="--postmaster-only --local --outgoing --timeout=0 --max-children=50"} : ${clamav_milter_socktimeout="60"} +: ${clamav_milter_socket_mode="755"} : ${clamav_clamd_socket="%%CLAMAV_CLAMD_SOCKET%%"} : ${clamav_clamd_enable="NO"} diff --git a/security/clamav/pkg-plist b/security/clamav/pkg-plist index 5a97ba2f8829..733b28e1ab09 100644 --- a/security/clamav/pkg-plist +++ b/security/clamav/pkg-plist @@ -9,18 +9,18 @@ bin/sigtool sbin/clamd include/clamav.h include/clamav-config.h -lib/libclamav.so.4 -lib/libclamav.so lib/libclamav.a lib/libclamav.la -%%UNRAR%%lib/libclamunrar.so.4 -%%UNRAR%%lib/libclamunrar.so -%%UNRAR%%lib/libclamunrar.la +lib/libclamav.so +lib/libclamav.so.4 %%UNRAR%%lib/libclamunrar.a -%%UNRAR%%lib/libclamunrar_iface.so.4 -%%UNRAR%%lib/libclamunrar_iface.so -%%UNRAR%%lib/libclamunrar_iface.la +%%UNRAR%%lib/libclamunrar.la +%%UNRAR%%lib/libclamunrar.so +%%UNRAR%%lib/libclamunrar.so.4 %%UNRAR%%lib/libclamunrar_iface.a +%%UNRAR%%lib/libclamunrar_iface.la +%%UNRAR%%lib/libclamunrar_iface.so +%%UNRAR%%lib/libclamunrar_iface.so.4 libdata/pkgconfig/libclamav.pc @unexec if cmp -s %D/etc/clamd.conf %D/etc/clamd.conf.default; then rm -f %D/etc/clamd.conf; fi etc/clamd.conf.default |