ports/64348: [PATCH] security/clamav: update to version 0.70
Oliver Eikemeier
eikemeier at fillmore-labs.com
Tue Mar 16 20:20:10 UTC 2004
>Number: 64348
>Category: ports
>Synopsis: [PATCH] security/clamav: update to version 0.70
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 16 12:20:09 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Oliver Eikemeier
>Release: FreeBSD 4.9-STABLE i386
>Organization:
Fillmore Labs - http://www.fillmore-labs.com
>Environment:
System: FreeBSD nuuk.fillmore-labs.com 4.9-STABLE
>Description:
Update to clamav 0.70
- new thread manager (with better SMP support)
- new switch ArchiveDetectEncrypted
- new directive: ArchiveDetectEncrypted
- see /usr/local/share/doc/clamav/NEWS
- install html documentation to /usr/local/share/doc/clamav/html
>How-To-Repeat:
>Fix:
Index: clamav/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/clamav/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- clamav/Makefile 6 Mar 2004 20:50:28 -0000 1.24
+++ clamav/Makefile 16 Mar 2004 19:58:07 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= clamav
-PORTVERSION= ${DISTVERSION:S/-/./g}
+PORTVERSION= ${DISTVERSION:S/-rc//g:S/-/./g}
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= clamav
@@ -23,7 +23,7 @@
arc:${PORTSDIR}/archivers/arc \
unzip:${PORTSDIR}/archivers/unzip
-DISTVERSION= 0.67-1
+DISTVERSION= 0.70-rc
USE_REINPLACE= yes
USE_GMAKE= yes
@@ -34,8 +34,12 @@
PKGINSTALL= ${WRKDIR}/pkg-install
+PORTDOCS= NEWS ChangeLog html
+
CONFIGURE_ARGS= --with-dbdir=${DATADIR} \
- --disable-clamav --enable-bigstack
+ --disable-clamuko \
+ --disable-clamav \
+ --enable-bigstack
CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
@@ -60,7 +64,8 @@
-e 's|^\#?(User) .*$$|\1 clamav|' \
-e 's|^\#?(AllowSupplementaryGroups)$$|\1|' \
-e 's|^\#?(FixStaleSocket)$$|\1|' \
- -e 's|^\#?(ScanMail)$$|\1|'
+ -e 's|^\#?(ScanMail)$$|\1|' \
+ -e 's|^\#?(UpdateLogFile) .*$$|\1 /var/log/clamav/freshclam.log|'
.include <bsd.port.pre.mk>
@@ -96,6 +101,7 @@
post-build:
@${REINPLACE_CMD} ${SED_CONF} ${BUILD_WRKSRC}/etc/clamav.conf
+ @${REINPLACE_CMD} ${SED_CONF} ${BUILD_WRKSRC}/etc/freshclam.conf
@${SED} ${SED_SCRIPT} ${PKGDIR}/pkg-install >${PKGINSTALL}
@${SED} ${SED_SCRIPT} ${FILESDIR}/clamav-clamd.sh \
>${WRKDIR}/clamav-clamd.sh
@@ -125,9 +131,12 @@
${RC_DIR}/clamav-milter${RC_SUFX}
.endif
.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
+ @${MKDIR} ${DOCSDIR}
@${INSTALL_DATA} ${INSTALL_WRKSRC}/NEWS ${INSTALL_WRKSRC}/ChangeLog \
${DOCSDIR}
+ @${MKDIR} ${DOCSDIR}/html
+ @${INSTALL_DATA} ${INSTALL_WRKSRC}/docs/html/*.* \
+ ${DOCSDIR}/html
.endif
@${SETENV} PKG_PREFIX=${PREFIX} \
${SH} ${PKGINSTALL} ${PREFIX} POST-INSTALL
Index: clamav/distinfo
===================================================================
RCS file: /home/ncvs/ports/security/clamav/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- clamav/distinfo 6 Mar 2004 20:45:46 -0000 1.5
+++ clamav/distinfo 16 Mar 2004 17:38:34 -0000
@@ -1,2 +1,2 @@
-MD5 (clamav-0.67-1.tar.gz) = e53d65fe2f7d4146f146c5720313381e
-SIZE (clamav-0.67-1.tar.gz) = 2282367
+MD5 (clamav-0.70-rc.tar.gz) = a5c296221fac9e05b865ed29f93e8718
+SIZE (clamav-0.70-rc.tar.gz) = 2251095
Index: clamav/pkg-descr
===================================================================
RCS file: /home/ncvs/ports/security/clamav/pkg-descr,v
retrieving revision 1.6
diff -u -r1.6 pkg-descr
--- clamav/pkg-descr 8 Dec 2003 14:06:49 -0000 1.6
+++ clamav/pkg-descr 16 Mar 2004 18:16:25 -0000
@@ -4,4 +4,4 @@
Optionally you can use the clamav-milter interface to connect
clamav with sendmail.
-WWW: http://clamav.sourceforge.net/
+WWW: http://www.clamav.net/
Index: clamav/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/security/clamav/pkg-plist,v
retrieving revision 1.12
diff -u -r1.12 pkg-plist
--- clamav/pkg-plist 6 Mar 2004 20:45:46 -0000 1.12
+++ clamav/pkg-plist 16 Mar 2004 18:35:42 -0000
@@ -19,9 +19,6 @@
@exec [ -f %B/freshclam.conf ] || cp %B/%f %B/freshclam.conf
etc/rc.d/clamav-clamd%%RC_SUFX%%
etc/rc.d/clamav-freshclam%%RC_SUFX%%
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
@owner clamav
@group clamav
%%DATADIR%%/daily.cvd
Index: clamav/files/patch-configure
===================================================================
RCS file: /home/ncvs/ports/security/clamav/files/patch-configure,v
retrieving revision 1.1
diff -u -r1.1 patch-configure
--- clamav/files/patch-configure 6 Mar 2004 20:45:47 -0000 1.1
+++ clamav/files/patch-configure 16 Mar 2004 18:07:52 -0000
@@ -18,11 +18,3 @@
INSTALL_FRESHCLAM_CONF_TRUE=
INSTALL_FRESHCLAM_CONF_FALSE='#'
else
-@@ -9564,6 +9564,7 @@
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
-+#include <sys/types.h>
- #include <netinet/in.h>
- int main(int argc, char **argv) { in_port_t pt; pt = 0; return pt; }
- _ACEOF
Index: clamav/files/patch-ltmain.sh
===================================================================
RCS file: clamav/files/patch-ltmain.sh
diff -N clamav/files/patch-ltmain.sh
--- clamav/files/patch-ltmain.sh 28 Sep 2003 13:29:28 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
---- ltmain.sh.orig Sat Sep 27 05:20:20 2003
-+++ ltmain.sh Sat Sep 27 05:24:02 2003
-@@ -4259,10 +4259,16 @@
- fi
-
- # Install the pseudo-library for information purposes.
-- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-- instname="$dir/$name"i
-- $show "$install_prog $instname $destdir/$name"
-- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ case $host in
-+ *-*-freebsd*)
-+ # Do not install the useless pseudo-library
-+ ;;
-+ *)
-+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+ instname="$dir/$name"i
-+ $show "$install_prog $instname $destdir/$name"
-+ $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ esac
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list