Date: Tue, 13 Jan 2004 14:40:29 +0100 (CET) From: Rob Evers <rob@debank.tv> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/61313: Update security/clamv-devel Message-ID: <200401131340.i0DDeTNs041028@haha.debank.tv> Resent-Message-ID: <200401131400.i0DE0aXw003579@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 61313 >Category: ports >Synopsis: Update security/clamv-devel >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Jan 13 06:00:36 PST 2004 >Closed-Date: >Last-Modified: >Originator: Rob Evers >Release: FreeBSD 4.9-RELEASE i386 >Organization: >Environment: System: FreeBSD haha.debank.tv 4.9-RELEASE FreeBSD 4.9-RELEASE #1: Thu Nov 13 01:17:26 CET 2003 rob@haha.debank.tv:/usr/obj/usr/src/sys/HAHA i386 >Description: Update security/clamv-devel Add freshclam daemon startup script Modify freshclam.conf with sane values Milter script cleanup (Milter socket changed !!) >How-To-Repeat: >Fix: New file files/freshclam.sh --- clamav-devel.patch begins here --- diff -ruN clamav-devel.orig/Makefile clamav-devel/Makefile --- clamav-devel.orig/Makefile Tue Jan 13 14:17:34 2004 +++ clamav-devel/Makefile Tue Jan 13 14:25:49 2004 @@ -6,11 +6,11 @@ # PORTNAME= clamav -PORTVERSION= 20040103 +PORTVERSION= 20040113 CATEGORIES= security MASTER_SITES= http://clamav.sourceforge.net/snapshot/ PKGNAMESUFFIX= -devel -DISTNAME= ${PORTNAME}-${PORTVERSION}-fixed +DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} MAINTAINER= rob@debank.tv COMMENT= Command line virus scanner written entirely in C @@ -23,8 +23,6 @@ arc:${PORTSDIR}/archivers/arc \ unzip:${PORTSDIR}/archivers/unzip -WRKSRC= ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} - USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes @@ -47,7 +45,7 @@ CLAMAVUSER?= clamav CLAMAVGROUP?= clamav CLAMAV_CLAMD_SOCKET?= /var/run/clamav/clamd -CLAMAV_MILTER_SOCKET?= /var/run/clmilter.sock +CLAMAV_MILTER_SOCKET?= /var/run/clamav/clmilter.sock PLIST_SUB+= CLAMAVUSER="${CLAMAVUSER}" PLIST_SUB+= CLAMAVGROUP="${CLAMAVGROUP}" @@ -64,7 +62,12 @@ -e 's|^\#?(PidFile) .*$$|\1 /var/run/clamav/clamd.pid|' \ -e 's|^\#?(LocalSocket) .*$$|\1 /var/run/clamav/clamd|' \ -e 's|^\#?(User) .*$$|\1 ${CLAMAVUSER}|' \ - -e 's|^\#?(ScanMail)$$|\1|' + -e 's|^\#?(ScanMail)$$|\1|' \ + -e 's|^\#?(Checks)$$|\#\1|' \ + -e 's|^\#?(DatabaseDirectory) .*$$|\1 ${DATADIR}|' \ + -e 's|^\#?(DatabaseOwner) .*$$|\1 ${CLAMAVUSER}|' \ + -e 's|^\#?(UpdateLogFile) .*$$|\1 /var/log/clamav/freshclam.log|' + .include <bsd.port.pre.mk> @@ -111,6 +114,7 @@ > ${WRKDIR}/clamav-clamd.sh @${SED} ${SED_SCRIPT} ${FILESDIR}/clamav-milter.sh \ > ${WRKDIR}/clamav-milter.sh + @${SED} ${SED_SCRIPT} ${FILESDIR}/freshclam.sh > ${WRKDIR}/freshclam.sh pre-install: ${SETENV} PKG_PREFIX=${PREFIX} \ @@ -126,6 +130,7 @@ @${CHOWN} -R ${CLAMAVUSER}:${CLAMAVGROUP} ${DATADIR} @${INSTALL_SCRIPT} ${WRKDIR}/clamav-clamd.sh \ ${RC_DIR}/clamav-clamd${RC_SUFX} + @${INSTALL_SCRIPT} ${WRKDIR}/freshclam.sh ${RC_DIR}/freshclam${RC_SUFX} .if defined(WITH_MILTER) @${INSTALL_SCRIPT} ${WRKDIR}/clamav-milter.sh \ ${RC_DIR}/clamav-milter${RC_SUFX} diff -ruN clamav-devel.orig/distinfo clamav-devel/distinfo --- clamav-devel.orig/distinfo Tue Jan 13 14:17:34 2004 +++ clamav-devel/distinfo Tue Jan 13 14:26:43 2004 @@ -1 +1 @@ -MD5 (clamav-20040103-fixed.tar.gz) = dff88aaa21e56f2f30efbfb1509ba8e4 +MD5 (clamav-devel-20040113.tar.gz) = d50b496eb4bf4f3e2f7e173588257294 diff -ruN clamav-devel.orig/files/clamav-milter.sh clamav-devel/files/clamav-milter.sh --- clamav-devel.orig/files/clamav-milter.sh Tue Jan 13 14:17:34 2004 +++ clamav-devel/files/clamav-milter.sh Tue Jan 13 14:31:43 2004 @@ -37,7 +37,7 @@ # set defaults -clamav_milter_enable=${clamav_milter_enable:-"NO"} +clamav_milter=${clamav_milter:-"NO"} clamav_milter_socket=${clamav_milter_socket:-"%%CLAMAV_MILTER_SOCKET%%"} clamav_milter_flags=${clamav_milter_flags:-"--postmaster-only --local --outgoing --max-children=50"} diff -ruN clamav-devel.orig/files/freshclam.sh clamav-devel/files/freshclam.sh --- clamav-devel.orig/files/freshclam.sh Thu Jan 1 01:00:00 1970 +++ clamav-devel/files/freshclam.sh Tue Jan 13 14:28:28 2004 @@ -0,0 +1,35 @@ +#!/bin/sh +# +# $FreeBSD: ports/security/clamav-devel/files/freshclam.sh +# + +# PROVIDE: freshclam +# REQUIRE: LOGIN +# BEFORE: mail +# KEYWORD: FreeBSD shutdown + +# +# Add the following lines to /etc/rc.conf to enable freshclam daemon: +# +#freshclam_enable"YES" +# +# See freshclam(1) for flags +# + +. %%RC_SUBR%% + +name=freshclam +rcvar=`set_rcvar` + +command=%%PREFIX%%/bin/freshclam +required_dirs=%%DATADIR%% +required_files=%%PREFIX%%/etc/freshclam.conf + + +# set defaults + +freshclam_enable=${freshclam_enable:-"NO"} +freshclam_flags=${freshclam_flags:-"--daemon"} + +load_rc_config $name +run_rc_command "$1" diff -ruN clamav-devel.orig/pkg-plist clamav-devel/pkg-plist --- clamav-devel.orig/pkg-plist Tue Jan 13 14:17:34 2004 +++ clamav-devel/pkg-plist Tue Jan 13 14:29:26 2004 @@ -3,6 +3,7 @@ bin/freshclam bin/sigtool etc/rc.d/clamav-clamd%%RC_SUFX%% +etc/rc.d/freshclam%%RC_SUFX%% %%CLAMAV-MILTER:%%etc/rc.d/clamav-milter%%RC_SUFX%% %%CLAMAV-MILTER:%%sbin/clamav-milter sbin/clamd --- clamav-devel.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200401131340.i0DDeTNs041028>