[Midnightbsd-cvs] mports: security/clamav: Update to 0.93.

[laffer1 at midnightbsd.org]

Log Message:
-----------
Update to 0.93.  fix cve-2008-1837

Modified Files:
--------------
    mports/security/clamav:
        Makefile (r1.11 -> r1.12)
        distinfo (r1.9 -> r1.10)
        pkg-plist (r1.4 -> r1.5)
    mports/security/clamav/files:
        clamav-clamd.in (r1.2 -> r1.3)
        pkg-install.in (r1.3 -> r1.4)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/security/clamav/pkg-plist,v
retrieving revision 1.4
retrieving revision 1.5
diff -L security/clamav/pkg-plist -L security/clamav/pkg-plist -u -r1.4 -r1.5
--- security/clamav/pkg-plist
+++ security/clamav/pkg-plist
@@ -1,4 +1,4 @@
- at comment $MidnightBSD$
+ at comment $FreeBSD: ports/security/clamav/pkg-plist,v 1.35 2008/04/16 16:05:54 garga Exp $
 bin/clamav-config
 bin/clamconf
 bin/clamscan
@@ -9,15 +9,15 @@
 sbin/clamd
 include/clamav.h
 include/clamav-config.h
-lib/libclamav.so.3
+lib/libclamav.so.4
 lib/libclamav.so
 lib/libclamav.a
 lib/libclamav.la
-%%UNRAR%%lib/libclamunrar.so.3
+%%UNRAR%%lib/libclamunrar.so.4
 %%UNRAR%%lib/libclamunrar.so
 %%UNRAR%%lib/libclamunrar.la
 %%UNRAR%%lib/libclamunrar.a
-%%UNRAR%%lib/libclamunrar_iface.so.3
+%%UNRAR%%lib/libclamunrar_iface.so.4
 %%UNRAR%%lib/libclamunrar_iface.so
 %%UNRAR%%lib/libclamunrar_iface.la
 %%UNRAR%%lib/libclamunrar_iface.a
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/security/clamav/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -L security/clamav/Makefile -L security/clamav/Makefile -u -r1.11 -r1.12
--- security/clamav/Makefile
+++ security/clamav/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	clamav
-PORTVERSION=	0.92.1
+PORTVERSION=	0.93
 CATEGORIES=	security
 MASTER_SITES=	SF
 
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/security/clamav/distinfo,v
retrieving revision 1.9
retrieving revision 1.10
diff -L security/clamav/distinfo -L security/clamav/distinfo -u -r1.9 -r1.10
--- security/clamav/distinfo
+++ security/clamav/distinfo
@@ -1,3 +1,3 @@
-MD5 (clamav-0.92.1.tar.gz) = c16e60f569b6ec575d8de494e788f9d2
-SHA256 (clamav-0.92.1.tar.gz) = e08a63adb3eda3dfc190d7a8b3fa55c881b1632583fbdf67327d3767d6966581
-SIZE (clamav-0.92.1.tar.gz) = 15284752
+MD5 (clamav-0.93.tar.gz) = 72ed6f4706858e72f24dda8a591df0da
+SHA256 (clamav-0.93.tar.gz) = 1fedc2bb4a850c962d6b0938b77b14480297bffa4cbf69ed95c4ee4f35b5db69
+SIZE (clamav-0.93.tar.gz) = 16134725
Index: pkg-install.in
===================================================================
RCS file: /home/cvs/mports/security/clamav/files/pkg-install.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -L security/clamav/files/pkg-install.in -L security/clamav/files/pkg-install.in -u -r1.3 -r1.4
--- security/clamav/files/pkg-install.in
+++ security/clamav/files/pkg-install.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: ports/security/clamav/files/pkg-install.in,v 1.4 2007/02/18 16:12:37 garga Exp $
+# $FreeBSD: ports/security/clamav/files/pkg-install.in,v 1.5 2008/02/21 13:19:50 garga Exp $
 # $MidnightBSD$
 
 PREFIX=${PKG_PREFIX:-%%PREFIX%%}
@@ -15,7 +15,7 @@
 
 PW="pw"
 CHOWN="chown"
-MKDIR="mkdir -p"
+INSTALL_DIR="install -d -o ${CLAMAVUSER} -g ${CLAMAVGROUP} -m 0755"
 
 if [ "$2" = "PRE-INSTALL" ]; then
 
@@ -42,16 +42,8 @@
 	fi
 
 elif [ "$2" = "POST-INSTALL" ]; then
-
-	[ ! -d "${DBDIR}" ] && (${MKDIR} ${DBDIR} || exit 1)
-	${CHOWN} -R ${CLAMAVUSER}:${CLAMAVGROUP} ${DBDIR} || exit 1
-
-	[ ! -d "${LOGDIR}" ] && (${MKDIR} ${LOGDIR} || exit 1)
-	${CHOWN} -R ${CLAMAVUSER}:${CLAMAVGROUP} ${LOGDIR} || exit 1
-
-	[ ! -d "${RUNDIR}" ] && (${MKDIR} ${RUNDIR} || exit 1)
-	${CHOWN} -R ${CLAMAVUSER}:${CLAMAVGROUP} ${RUNDIR} || exit 1
-
+	${INSTALL_DIR} ${DBDIR} ${LOGDIR} ${RUNDIR}
+	${CHOWN} -R ${CLAMAVUSER}:${CLAMAVGROUP} ${DBDIR} ${LOGDIR} ${RUNDIR}
 fi
 
 exit 0
Index: clamav-clamd.in
===================================================================
RCS file: /home/cvs/mports/security/clamav/files/clamav-clamd.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -L security/clamav/files/clamav-clamd.in -L security/clamav/files/clamav-clamd.in -u -r1.2 -r1.3
--- security/clamav/files/clamav-clamd.in
+++ security/clamav/files/clamav-clamd.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: ports/security/clamav/files/clamav-clamd.in,v 1.1 2006/04/06 15:20:18 garga Exp $
+# $FreeBSD: ports/security/clamav/files/clamav-clamd.in,v 1.2 2008/04/16 16:05:54 garga Exp $
 # $MidnightBSD$
 
 # PROVIDE: clamd
@@ -32,4 +32,14 @@
 : ${clamav_clamd_flags=""}
 : ${clamav_clamd_socket="%%CLAMAV_CLAMD_SOCKET%%"}
 
+start_precmd=clamav_clamd_precmd
+
+#clamav .93 won't start without a valid main.cvd file
+clamav_clamd_precmd() {
+	if [ ! -f %%DBDIR%%/main.cvd ];then
+		echo "Missing %%DBDIR%%/clamav/*.cvd files.  You must run freshclam first"
+		exit 1
+	fi
+}
+
 run_rc_command "$1"