Date: Thu, 6 Apr 2006 08:19:28 -0300 (BRST) From: Renato Botelho <garga@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/95403: [PATCH] security/clamav: update to 0.88.1 Message-ID: <200604061119.k36BJSfY052326@data.galle.com.br> Resent-Message-ID: <200604061120.k36BKGP5006627@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 95403
>Category: ports
>Synopsis: [PATCH] security/clamav: update to 0.88.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Apr 06 11:20:16 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Renato Botelho
>Release: FreeBSD 6.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD data.galle.com.br 6.0-STABLE FreeBSD 6.0-STABLE #0: Mon Jan 30 16:42:01 BRDT 2006
>Description:
- Update to 0.88.1
- Use USE_RC_SUBR=script facility
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- clamav-0.88.1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/security/clamav/Makefile,v
retrieving revision 1.71
diff -u -u -r1.71 Makefile
--- Makefile 23 Feb 2006 10:38:52 -0000 1.71
+++ Makefile 6 Apr 2006 11:17:57 -0000
@@ -6,8 +6,7 @@
#
PORTNAME= clamav
-PORTVERSION= 0.88
-PORTREVISION= 1
+PORTVERSION= 0.88.1
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= clamav
@@ -26,11 +25,10 @@
CURL "Support URL downloading" Off \
LIBUNRAR "Support for external Unrar library" Off
-USE_REINPLACE= yes
USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
-USE_RC_SUBR= yes
+USE_RC_SUBR= clamav-clamd.sh clamav-freshclam.sh
PORTDOCS= NEWS ChangeLog html
@@ -66,7 +64,7 @@
CLAMAV_CLAMD_SOCKET?= ${RUNDIR}/clamd
CLAMAV_MILTER_SOCKET?= ${RUNDIR}/clmilter.sock
-SUB_FILES= pkg-install pkg-deinstall clamav-clamd.sh clamav-freshclam.sh
+SUB_FILES= pkg-install pkg-deinstall
SUB_LIST= DBDIR=${DBDIR} \
LOGDIR=${LOGDIR} \
RUNDIR=${RUNDIR} \
@@ -90,11 +88,6 @@
PLIST_SUB+= CLAMAVUSER=${CLAMAVUSER} \
CLAMAVGROUP=${CLAMAVGROUP}
-RC_DIR= ${PREFIX}/etc/rc.d
-RC_SUFX= .sh
-SUB_LIST+= RC_DIR=${RC_DIR} RC_SUFX=${RC_SUFX}
-PLIST_SUB+= RC_DIR=${RC_DIR} RC_SUFX=${RC_SUFX}
-
.include <bsd.port.pre.mk>
.if ${OSVERSION} == 502010
@@ -102,7 +95,7 @@
.endif
.if defined(WITH_MILTER)
-SUB_FILES+= clamav-milter.sh
+USE_RC_SUBR+= clamav-milter.sh
.if !defined(WITHOUT_LDAP) && exists(${LOCALBASE}/lib/libldap.so)
USE_OPENLDAP= yes
LDFLAGS+= -lldap
@@ -156,19 +149,11 @@
${SH} ${PKGINSTALL} ${PREFIX} PRE-INSTALL
post-install:
- @${INSTALL_SCRIPT} ${WRKDIR}/clamav-clamd.sh \
- ${DESTDIR}${RC_DIR}/clamav-clamd${RC_SUFX}
- @${INSTALL_SCRIPT} ${WRKDIR}/clamav-freshclam.sh \
- ${DESTDIR}${RC_DIR}/clamav-freshclam${RC_SUFX}
@${CHOWN} -R ${CLAMAVUSER}:${CLAMAVGROUP} ${DESTDIR}${DBDIR}
.for c in clamd freshclam
@[ -f ${DESTDIR}${PREFIX}/etc/${c}.conf ] || \
${CP} ${DESTDIR}${PREFIX}/etc/${c}.conf.default ${DESTDIR}${PREFIX}/etc/${c}.conf
.endfor
-.if defined(WITH_MILTER)
- @${INSTALL_SCRIPT} ${WRKDIR}/clamav-milter.sh \
- ${DESTDIR}${RC_DIR}/clamav-milter${RC_SUFX}
-.endif
.if !defined(NOPORTDOCS)
@${MKDIR} ${DESTDIR}${DOCSDIR}
@${INSTALL_DATA} ${INSTALL_WRKSRC}/NEWS ${INSTALL_WRKSRC}/ChangeLog \
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/security/clamav/distinfo,v
retrieving revision 1.27
diff -u -u -r1.27 distinfo
--- distinfo 11 Jan 2006 10:27:29 -0000 1.27
+++ distinfo 6 Apr 2006 11:17:57 -0000
@@ -1,3 +1,3 @@
-MD5 (clamav-0.88.tar.gz) = 5d23205673c32e2b1b6db95000e6da74
-SHA256 (clamav-0.88.tar.gz) = 7912be29d13dae676691fbad7fa5fc1518eb3b8b45f8d147097908533ca1f8db
-SIZE (clamav-0.88.tar.gz) = 4564473
+MD5 (clamav-0.88.1.tar.gz) = 9fe8c47037051e350077513dd94fb76a
+SHA256 (clamav-0.88.1.tar.gz) = 25f678d1268fa91913dd2f0b7e08338faf65a4f48618ce59d773e3c42e606cff
+SIZE (clamav-0.88.1.tar.gz) = 5348769
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/security/clamav/pkg-plist,v
retrieving revision 1.26
diff -u -u -r1.26 pkg-plist
--- pkg-plist 23 Feb 2006 10:38:52 -0000 1.26
+++ pkg-plist 6 Apr 2006 11:17:57 -0000
@@ -1,15 +1,9 @@
@comment $FreeBSD: ports/security/clamav/pkg-plist,v 1.26 2006/02/23 10:38:52 ade Exp $
-%%CLAMAV-MILTER%%@unexec [ ! -f %%RUNDIR%%/clamav-milter.pid ] || %%RC_DIR%%/clamav-milter%%RC_SUFX%% stop || true
-@unexec [ ! -f %%RUNDIR%%/freshclam.pid ] || %%RC_DIR%%/clamav-freshclam%%RC_SUFX%% stop || true
-@unexec [ ! -f %%RUNDIR%%/clamd.pid ] || %%RC_DIR%%/clamav-clamd%%RC_SUFX%% stop || true
bin/clamav-config
bin/clamscan
bin/clamdscan
bin/freshclam
bin/sigtool
-etc/rc.d/clamav-clamd%%RC_SUFX%%
-etc/rc.d/clamav-freshclam%%RC_SUFX%%
-%%CLAMAV-MILTER%%etc/rc.d/clamav-milter%%RC_SUFX%%
%%CLAMAV-MILTER%%sbin/clamav-milter
sbin/clamd
include/clamav.h
Index: files/clamav-freshclam.sh.in
===================================================================
RCS file: /home/pcvs/ports/security/clamav/files/clamav-freshclam.sh.in,v
retrieving revision 1.2
diff -u -u -r1.2 clamav-freshclam.sh.in
--- files/clamav-freshclam.sh.in 20 Feb 2006 20:47:37 -0000 1.2
+++ files/clamav-freshclam.sh.in 6 Apr 2006 11:17:57 -0000
@@ -23,7 +23,7 @@
command=%%PREFIX%%/bin/freshclam
pidfile=%%RUNDIR%%/freshclam.pid
-command_args="--daemon"
+command_args="--daemon -p ${pidfile}"
required_dirs=%%DBDIR%%
required_files=%%PREFIX%%/etc/freshclam.conf
--- clamav-0.88.1.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?200604061119.k36BJSfY052326>