ports/74172: Fix ports: security/clamav and security/clamav-devel (change db directory to /var/db/clamav and fix removal of db on deinstall)

Sat Nov 20 17:50:34 UTC 2004

>Number:         74172
>Category:       ports
>Synopsis:       Fix ports: security/clamav and security/clamav-devel (change db directory to /var/db/clamav and fix removal of db on deinstall)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 20 17:50:32 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Jean-Yves Lefort
>Release:        FreeBSD 5.3-RELEASE i386
>Organization:
>Environment:
System: FreeBSD jsite.lefort.net 5.3-RELEASE FreeBSD 5.3-RELEASE #0: Fri Nov 12 15:27:39 CET 2004 jylefort at jsite.lefort.net:/usr/obj/usr/src/sys/JSITE i386
>Description:
For the sake of coherence, the ClamAV database should be installed in
/var/db/clamav, not /usr/local/share/clamav. Also fixes the database
removal on package deinstallation.
>How-To-Repeat:
>Fix:
diff -ruN /usr/ports/security/clamav/Makefile clamav/Makefile

--- /usr/ports/security/clamav/Makefile	Sun Nov  7 05:46:54 2004
+++ clamav/Makefile	Sat Nov 20 17:57:39 2004
@@ -7,7 +7,7 @@
 
 PORTNAME=	clamav
 PORTVERSION=	${DISTVERSION:C/([a-z])[a-z]*/.\1/g:S/-/./g}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	clamav
@@ -39,7 +39,10 @@
 
 PORTDOCS=	NEWS ChangeLog html
 
-CONFIGURE_ARGS=	--with-dbdir=${DATADIR} \
+DBDIR=		/var/db/clamav
+PLIST_SUB+=	DBDIR=${DBDIR}
+
+CONFIGURE_ARGS=	--with-dbdir=${DBDIR} \
 		--disable-clamuko \
 		--disable-clamav \
 		--enable-bigstack \
@@ -64,7 +67,7 @@
 CLAMAV_MILTER_SOCKET?=	/var/run/clamav/clmilter.sock
 
 SED_SCRIPT=	-e 's|%%PREFIX%%|${PREFIX}|g' \
-		-e 's|%%DATADIR%%|${DATADIR}|g' \
+		-e 's|%%DBDIR%%|${DBDIR}|g' \
 		-e 's|%%CLAMAVUSER%%|${CLAMAVUSER}|g' \
 		-e 's|%%CLAMAVGROUP%%|${CLAMAVGROUP}|g' \
 		-e 's|%%CLAMAV_CLAMD_SOCKET%%|${CLAMAV_CLAMD_SOCKET}|g' \
@@ -78,7 +81,7 @@
 		-e 's|^\#?(AllowSupplementaryGroups)$$|\1|' \
 		-e 's|^\#?(ScanMail)$$|\1|' \
 		-e 's|^\#?(NotifyClamd)$$|\1|' \
-		-e 's|^\#?(DatabaseDirectory) .*$$|\1 ${DATADIR}|' \
+		-e 's|^\#?(DatabaseDirectory) .*$$|\1 ${DBDIR}|' \
 		-e 's|^\#?(DatabaseOwner) .*$$|\1 ${CLAMAVUSER}|' \
 		-e 's|^\#?(FixStaleSocket)$$|\1|'
 
@@ -149,7 +152,7 @@
 		${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}${DATADIR}
+	@${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
diff -ruN /usr/ports/security/clamav/files/clamav-clamd.sh clamav/files/clamav-clamd.sh
--- /usr/ports/security/clamav/files/clamav-clamd.sh	Thu Oct 14 12:50:18 2004
+++ clamav/files/clamav-clamd.sh	Sat Nov 20 17:55:34 2004
@@ -23,7 +23,7 @@
 
 command=%%PREFIX%%/sbin/clamd
 pidfile=/var/run/clamav/clamd.pid
-required_dirs=%%DATADIR%%
+required_dirs=%%DBDIR%%
 required_files=%%PREFIX%%/etc/clamd.conf
 
 # read settings, set default values
diff -ruN /usr/ports/security/clamav/files/clamav-freshclam.sh clamav/files/clamav-freshclam.sh
--- /usr/ports/security/clamav/files/clamav-freshclam.sh	Thu Oct 14 12:50:18 2004
+++ clamav/files/clamav-freshclam.sh	Sat Nov 20 17:55:25 2004
@@ -24,7 +24,7 @@
 command=%%PREFIX%%/bin/freshclam
 pidfile=/var/run/clamav/freshclam.pid
 command_args="--daemon"
-required_dirs=%%DATADIR%%
+required_dirs=%%DBDIR%%
 required_files=%%PREFIX%%/etc/freshclam.conf
 
 # read settings, set default values
diff -ruN /usr/ports/security/clamav/files/clamav-milter.sh clamav/files/clamav-milter.sh
--- /usr/ports/security/clamav/files/clamav-milter.sh	Thu Oct 14 12:50:18 2004
+++ clamav/files/clamav-milter.sh	Sat Nov 20 17:55:42 2004
@@ -22,7 +22,7 @@
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/sbin/clamav-milter
-required_dirs=%%DATADIR%%
+required_dirs=%%DBDIR%%
 required_files=%%PREFIX%%/etc/clamd.conf
 
 start_precmd=start_precmd
diff -ruN /usr/ports/security/clamav/pkg-install clamav/pkg-install
--- /usr/ports/security/clamav/pkg-install	Thu Oct 14 12:50:18 2004
+++ clamav/pkg-install	Sat Nov 20 17:56:10 2004
@@ -11,7 +11,7 @@
 
 CLAMRUN=$DESTDIR/var/run/clamav
 CLAMLOG=$DESTDIR/var/log/clamav
-DATADIR=$DESTDIR%%DATADIR%%
+DBDIR=$DESTDIR%%DBDIR%%
 
 if [ "$2" = "PRE-INSTALL" ]; then
 
@@ -49,9 +49,9 @@
 		chown "$CLAMAVUSER:$CLAMAVGROUP" "$CLAMLOG" || exit 1
 	fi
 
-	if [ ! -d "$DATADIR" ]; then
-		mkdir -p "$DATADIR" || exit 1
-		chown "$CLAMAVUSER:$CLAMAVGROUP" "$DATADIR" || exit 1
+	if [ ! -d "$DBDIR" ]; then
+		mkdir -p "$DBDIR" || exit 1
+		chown "$CLAMAVUSER:$CLAMAVGROUP" "$DBDIR" || exit 1
 	fi
 
 	if [ -f "$DESTDIR$PREFIX/etc/clamav.conf" ]; then
diff -ruN /usr/ports/security/clamav/pkg-plist clamav/pkg-plist
--- /usr/ports/security/clamav/pkg-plist	Sun Nov  7 05:46:54 2004
+++ clamav/pkg-plist	Sat Nov 20 18:27:03 2004
@@ -22,8 +22,8 @@
 @unexec if cmp -s %D/etc/freshclam.conf %D/etc/freshclam.conf.default; then rm -f %D/etc/freshclam.conf; fi
 etc/freshclam.conf.default
 @exec [ -f %B/freshclam.conf ] || cp %B/%f %B/freshclam.conf
- at unexec [ -s %D/%%DATADIR%%/daily.cvd ] || rm -f %D/%%DATADIR%%/daily.cvd || true
- at unexec [ -s %D/%%DATADIR%%/main.cvd ] || rm -f %D/%%DATADIR%%/main.cvd || true
- at dirrm %%DATADIR%%
+ at unexec [ ! -f %%DBDIR%%/daily.cvd ] || rm -f %%DBDIR%%/daily.cvd || true
+ at unexec [ ! -f %%DBDIR%%/main.cvd ] || rm -f %%DBDIR%%/main.cvd || true
+ at unexec rmdir %%DBDIR%%
 @unexec rmdir /var/run/clamav 2>/dev/null || true
 @unexec rmdir /var/log/clamav 2>/dev/null || true

diff -ruN /usr/ports/security/clamav-devel/Makefile clamav-devel/Makefile
--- /usr/ports/security/clamav-devel/Makefile	Fri Nov  5 08:27:42 2004
+++ clamav-devel/Makefile	Sat Nov 20 18:34:58 2004
@@ -40,7 +40,10 @@
 
 PORTDOCS=	NEWS ChangeLog html
 
-CONFIGURE_ARGS=	--with-dbdir=${DATADIR} \
+DBDIR=		/var/db/clamav
+PLIST_SUB+=	DBDIR=${DBDIR}
+
+CONFIGURE_ARGS=	--with-dbdir=${DBDIR} \
 		--disable-clamuko \
 		--disable-clamav \
 		--enable-bigstack \
@@ -64,7 +67,7 @@
 CLAMAV_MILTER_SOCKET?=	/var/run/clamav/clmilter.sock
 
 SED_SCRIPT=	-e 's|%%PREFIX%%|${PREFIX}|g' \
-		-e 's|%%DATADIR%%|${DATADIR}|g' \
+		-e 's|%%DBDIR%%|${DBDIR}|g' \
 		-e 's|%%CLAMAVUSER%%|${CLAMAVUSER}|g' \
 		-e 's|%%CLAMAVGROUP%%|${CLAMAVGROUP}|g' \
 		-e 's|%%CLAMAV_CLAMD_SOCKET%%|${CLAMAV_CLAMD_SOCKET}|g' \
@@ -79,7 +82,7 @@
 		-e 's|^\#?(ScanMail)$$|\1|' \
 		-e 's|^\#?(NotifyClamd)$$|\1|' \
 		-e 's|^\#?(Checks)$$|\#\1|' \
-		-e 's|^\#?(DatabaseDirectory) .*$$|\1 ${DATADIR}|' \
+		-e 's|^\#?(DatabaseDirectory) .*$$|\1 ${DBDIR}|' \
 		-e 's|^\#?(DatabaseOwner) .*$$|\1 ${CLAMAVUSER}|' \
 		-e 's|^\#?(UpdateLogFile) .*$$|\1 /var/log/clamav/freshclam.log|' \
 		-e 's|^\#?(FixStaleSocket)$$|\1|'
@@ -150,7 +153,7 @@
 		${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}${DATADIR}
+	@${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
diff -ruN /usr/ports/security/clamav-devel/files/clamav-clamd.sh clamav-devel/files/clamav-clamd.sh
--- /usr/ports/security/clamav-devel/files/clamav-clamd.sh	Fri Nov  5 08:27:42 2004
+++ clamav-devel/files/clamav-clamd.sh	Sat Nov 20 18:35:28 2004
@@ -23,7 +23,7 @@
 
 command=%%PREFIX%%/sbin/clamd
 pidfile=/var/run/clamav/clamd.pid
-required_dirs=%%DATADIR%%
+required_dirs=%%DBDIR%%
 required_files=%%PREFIX%%/etc/clamd.conf
 
 # read settings, set default values
diff -ruN /usr/ports/security/clamav-devel/files/clamav-freshclam.sh clamav-devel/files/clamav-freshclam.sh
--- /usr/ports/security/clamav-devel/files/clamav-freshclam.sh	Fri Nov  5 08:27:42 2004
+++ clamav-devel/files/clamav-freshclam.sh	Sat Nov 20 18:35:13 2004
@@ -24,7 +24,7 @@
 command=%%PREFIX%%/bin/freshclam
 pidfile=/var/run/clamav/freshclam.pid
 command_args="--daemon"
-required_dirs=%%DATADIR%%
+required_dirs=%%DBDIR%%
 required_files=%%PREFIX%%/etc/freshclam.conf
 
 # read settings, set default values
diff -ruN /usr/ports/security/clamav-devel/files/clamav-milter.sh clamav-devel/files/clamav-milter.sh
--- /usr/ports/security/clamav-devel/files/clamav-milter.sh	Fri Nov  5 08:27:42 2004
+++ clamav-devel/files/clamav-milter.sh	Sat Nov 20 18:35:21 2004
@@ -22,7 +22,7 @@
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/sbin/clamav-milter
-required_dirs=%%DATADIR%%
+required_dirs=%%DBDIR%%
 required_files=%%PREFIX%%/etc/clamd.conf
 
 start_precmd=start_precmd
diff -ruN /usr/ports/security/clamav-devel/pkg-install clamav-devel/pkg-install
--- /usr/ports/security/clamav-devel/pkg-install	Fri Nov  5 08:27:42 2004
+++ clamav-devel/pkg-install	Sat Nov 20 18:35:54 2004
@@ -11,7 +11,7 @@
 
 CLAMRUN=$DESTDIR/var/run/clamav
 CLAMLOG=$DESTDIR/var/log/clamav
-DATADIR=$DESTDIR%%DATADIR%%
+DBDIR=$DESTDIR%%DBDIR%%
 
 if [ "$2" = "PRE-INSTALL" ]; then
 
@@ -49,9 +49,9 @@
 		chown "$CLAMAVUSER:$CLAMAVGROUP" "$CLAMLOG" || exit 1
 	fi
 
-	if [ ! -d "$DATADIR" ]; then
-		mkdir -p "$DATADIR" || exit 1
-		chown "$CLAMAVUSER:$CLAMAVGROUP" "$DATADIR" || exit 1
+	if [ ! -d "$DBDIR" ]; then
+		mkdir -p "$DBDIR" || exit 1
+		chown "$CLAMAVUSER:$CLAMAVGROUP" "$DBDIR" || exit 1
 	fi
 
 	if [ -f "$DESTDIR$PREFIX/etc/clamav.conf" ]; then
diff -ruN /usr/ports/security/clamav-devel/pkg-plist clamav-devel/pkg-plist
--- /usr/ports/security/clamav-devel/pkg-plist	Fri Nov  5 08:27:42 2004
+++ clamav-devel/pkg-plist	Sat Nov 20 18:36:32 2004
@@ -22,8 +22,8 @@
 @unexec if cmp -s %D/etc/freshclam.conf %D/etc/freshclam.conf.default; then rm -f %D/etc/freshclam.conf; fi
 etc/freshclam.conf.default
 @exec [ -f %B/freshclam.conf ] || cp %B/%f %B/freshclam.conf
- at unexec [ -s %D/%%DATADIR%%/daily.cvd ] || rm -f %D/%%DATADIR%%/daily.cvd || true
- at unexec [ -s %D/%%DATADIR%%/main.cvd ] || rm -f %D/%%DATADIR%%/main.cvd || true
- at unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
+ at unexec [ ! -f %%DBDIR%%/daily.cvd ] || rm -f %%DBDIR%%/daily.cvd || true
+ at unexec [ ! -f %%DBDIR%%/main.cvd ] || rm -f %%DBDIR%%/main.cvd || true
+ at unexec rmdir %%DBDIR%%
 @unexec rmdir /var/run/clamav 2>/dev/null || true
 @unexec rmdir /var/log/clamav 2>/dev/null || true

--- /usr/ports/UPDATING	Fri Nov 19 05:23:02 2004
+++ UPDATING	Sat Nov 20 18:33:45 2004
@@ -6,6 +6,14 @@
 time you update your ports collection, before attempting any port
 upgrades.
 
+20041120:
+  AFFECTS: users of security/clamav, security/clamav-devel
+  AUTHOR: jylefort at brutele.be
+
+  The ClamAV database path has changed from /usr/local/share/clamav to
+  /var/db/clamav. You should update the DatabaseDirectory keyword in
+  /usr/local/etc/clamd.conf and /usr/local/etc/freshclam.conf.
+
 20041118:
   AFFECTS: users of sysutils/portupgrade
   AUTHOR: lofi at freebsd.org
>Release-Note:
>Audit-Trail:
>Unformatted:

