From 473c1e5a05a5e71ba769d99d03b24260c0f8cc40 Mon Sep 17 00:00:00 2001 From: mbalmer Date: Wed, 28 Feb 2007 20:31:08 +0000 Subject: [PATCH] Update to ClamAV 0.90. A lot of improvments and bugfixes, see www.clamav.net for all details. ok nikolay --- security/clamav/Makefile | 9 +++-- security/clamav/distinfo | 9 ++--- .../patch-clamav_milter-clamav_milter_c | 8 ++--- .../clamav/patches/patch-clamd_Makefile_in | 8 ++--- security/clamav/patches/patch-clamd_session_c | 33 ++++++++++--------- security/clamav/patches/patch-clamd_session_h | 16 ++++----- .../clamav/patches/patch-clamdscan_client_c | 16 ++++----- security/clamav/patches/patch-configure | 31 ++++++++--------- security/clamav/patches/patch-etc-clamd_conf | 6 ++-- .../clamav/patches/patch-etc-freshclam_conf | 10 +++--- .../patches/patch-libclamav_Makefile_am | 10 +++--- .../patches/patch-libclamav_Makefile_in | 14 ++++---- .../clamav/patches/patch-libclamav_mbox_c | 6 ++-- .../patches/patch-libclamav_ole2_extract_c | 10 +++--- .../clamav/patches/patch-libclamav_scanner_c | 12 +++---- security/clamav/patches/patch-libclamav_str_c | 10 +++--- .../patches/patch-libclamav_vba_extract_c | 8 ++--- security/clamav/pkg/PLIST | 4 ++- 18 files changed, 111 insertions(+), 109 deletions(-) diff --git a/security/clamav/Makefile b/security/clamav/Makefile index 9a2ce71f4b9..4222d440e87 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.23 2007/01/17 08:27:20 mbalmer Exp $ +# $OpenBSD: Makefile,v 1.24 2007/02/28 20:31:08 mbalmer Exp $ COMMENT= "virus scanner" -DISTNAME= clamav-0.88.7 -PKGNAME= ${DISTNAME}p1 +DISTNAME= clamav-0.90 CATEGORIES= security -SHARED_LIBS= clamav 2.0 +SHARED_LIBS= clamav 3.0 HOMEPAGE= http://www.clamav.net/ @@ -47,7 +46,7 @@ CONFIGURE_ARGS+= --disable-clamav \ NO_REGRESS= Yes -CONFIGURE_ENV+= LDFLAGS="-L/usr/lib -L${LOCALBASE}/lib" \ +CONFIGURE_ENV+= LDFLAGS="-pthread -L/usr/lib -L${LOCALBASE}/lib" \ CPPFLAGS="-I/usr/include -I${LOCALBASE}/include" DOCS= clamav-mirror-howto.pdf clamdoc.pdf signatures.pdf diff --git a/security/clamav/distinfo b/security/clamav/distinfo index c3569beab1c..070a7701a3e 100644 --- a/security/clamav/distinfo +++ b/security/clamav/distinfo @@ -1,4 +1,5 @@ -MD5 (clamav-0.88.7.tar.gz) = 34a9d58cf5bcb04dbe3eb32b5367a3f8 -RMD160 (clamav-0.88.7.tar.gz) = 14d7c6255df618b16b704fc1cb5ce2b1385fa0e8 -SHA1 (clamav-0.88.7.tar.gz) = 7d7833dc454437ed7044b1c734f0a13e4dc1ead2 -SIZE (clamav-0.88.7.tar.gz) = 9510548 +MD5 (clamav-0.90.tar.gz) = f04372e49c3c5ff3bd94bbe1fef2eaca +RMD160 (clamav-0.90.tar.gz) = 1b22144d3a41376093b73bbeb5302092a18ca685 +SHA1 (clamav-0.90.tar.gz) = 574b84429b878df3a9d862ea386c970326850158 +SHA256 (clamav-0.90.tar.gz) = c39005318d4a7d27d9710c3d71396b8c500e0bc5a184cb7392051c9ca9dea60d +SIZE (clamav-0.90.tar.gz) = 11575374 diff --git a/security/clamav/patches/patch-clamav_milter-clamav_milter_c b/security/clamav/patches/patch-clamav_milter-clamav_milter_c index 785fc77a7ff..9b0b3b723a8 100644 --- a/security/clamav/patches/patch-clamav_milter-clamav_milter_c +++ b/security/clamav/patches/patch-clamav_milter-clamav_milter_c @@ -1,6 +1,6 @@ ---- clamav-milter/clamav-milter.c.orig Thu Jun 23 22:03:06 2005 -+++ clamav-milter/clamav-milter.c Wed Jun 29 11:00:23 2005 -@@ -886,7 +886,7 @@ main(int argc, char **argv) +--- clamav-milter/clamav-milter.c.orig Mon Feb 12 23:36:49 2007 ++++ clamav-milter/clamav-milter.c Wed Feb 14 08:26:32 2007 +@@ -1064,7 +1064,7 @@ main(int argc, char **argv) * uid == 0 for that */ on = 1; @@ -9,7 +9,7 @@ perror("setsockopt"); return EX_UNAVAILABLE; } -@@ -908,7 +908,7 @@ main(int argc, char **argv) +@@ -1086,7 +1086,7 @@ main(int argc, char **argv) memset(&ifr, '\0', sizeof(struct ifreq)); strncpy(ifr.ifr_name, iface, sizeof(ifr.ifr_name) - 1); diff --git a/security/clamav/patches/patch-clamd_Makefile_in b/security/clamav/patches/patch-clamd_Makefile_in index 670c8606155..ed6efdb80b7 100644 --- a/security/clamav/patches/patch-clamd_Makefile_in +++ b/security/clamav/patches/patch-clamd_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-clamd_Makefile_in,v 1.3 2006/08/15 18:48:22 mbalmer Exp $ ---- clamd/Makefile.in.orig Sat Jul 1 06:12:55 2006 -+++ clamd/Makefile.in Fri Jul 28 02:28:02 2006 -@@ -147,7 +147,9 @@ INSTALL_DATA = @INSTALL_DATA@ +$OpenBSD: patch-clamd_Makefile_in,v 1.4 2007/02/28 20:31:08 mbalmer Exp $ +--- clamd/Makefile.in.orig Tue Feb 13 02:12:01 2007 ++++ clamd/Makefile.in Wed Feb 14 08:26:32 2007 +@@ -157,7 +157,9 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ diff --git a/security/clamav/patches/patch-clamd_session_c b/security/clamav/patches/patch-clamd_session_c index e6b231658fa..644fa549160 100644 --- a/security/clamav/patches/patch-clamd_session_c +++ b/security/clamav/patches/patch-clamd_session_c @@ -1,25 +1,28 @@ -$OpenBSD: patch-clamd_session_c,v 1.1 2007/01/17 08:27:20 mbalmer Exp $ ---- clamd/session.c.orig Sun Oct 30 17:00:52 2005 -+++ clamd/session.c Tue Jan 16 16:19:41 2007 -@@ -51,6 +51,9 @@ int command(int desc, const struct cl_no +$OpenBSD: patch-clamd_session_c,v 1.2 2007/02/28 20:31:08 mbalmer Exp $ +--- clamd/session.c.orig Sun Feb 11 01:19:59 2007 ++++ clamd/session.c Wed Feb 14 08:53:39 2007 +@@ -232,8 +232,10 @@ int command(int desc, const struct cl_en + { char buff[1025]; - int bread, opt, retval; - struct cfgstruct *cpt; + int bread, opt; + struct msghdr msg; + struct cmsghdr *cmsg; + unsigned char buf[CMSG_SPACE(sizeof(int))]; - - retval = poll_fd(desc, timeout); -@@ -155,7 +158,29 @@ int command(int desc, const struct cl_no - - scanfd(fd, NULL, root, limits, options, copt, desc, 0); - close(fd); /* FIXME: should we close it here? */ -+ } else if(!strncmp(buff, CMD13, strlen(CMD13))) { /* FILDES */ +- + bread = readsock(desc, buff, sizeof(buff)-1, '\n', timeout, 0, 1); + if(bread == -2) /* timeout */ + return -2; +@@ -367,7 +369,29 @@ int command(int desc, const struct cl_en + logg("%s: OK\n", path); + } + } +- ++ } else if(!strncmp(buff, CMD14, strlen(CMD14))) { /* FILDES */ + memset(&msg, 0, sizeof(msg)); + msg.msg_control = buf; + msg.msg_controllen = sizeof(buf); - ++ + if (recvmsg(desc, &msg, 0) == -1) { + logg("recvmsg failed!"); + return -1; @@ -34,7 +37,7 @@ $OpenBSD: patch-clamd_session_c,v 1.1 2007/01/17 08:27:20 mbalmer Exp $ + cmsg->cmsg_level == SOL_SOCKET && + cmsg->cmsg_type == SCM_RIGHTS) { + int fd = *(int *)CMSG_DATA(cmsg); -+ scanfd(fd, NULL, root, limits, options, copt, desc, 0); ++ scanfd(fd, NULL, engine, limits, options, copt, desc); + close(fd); + } + } diff --git a/security/clamav/patches/patch-clamd_session_h b/security/clamav/patches/patch-clamd_session_h index fe9e3a79f8b..9cffdb34e43 100644 --- a/security/clamav/patches/patch-clamd_session_h +++ b/security/clamav/patches/patch-clamd_session_h @@ -1,11 +1,11 @@ -$OpenBSD: patch-clamd_session_h,v 1.1 2007/01/17 08:27:20 mbalmer Exp $ ---- clamd/session.h.orig Sun Oct 30 17:00:43 2005 -+++ clamd/session.h Tue Jan 16 15:50:43 2007 -@@ -36,6 +36,7 @@ - #define CMD10 "END" +$OpenBSD: patch-clamd_session_h,v 1.2 2007/02/28 20:31:08 mbalmer Exp $ +--- clamd/session.h.orig Tue Jan 30 22:19:10 2007 ++++ clamd/session.h Wed Feb 14 08:27:25 2007 +@@ -38,6 +38,7 @@ #define CMD11 "SHUTDOWN" #define CMD12 "FD" -+#define CMD13 "FILDES" + #define CMD13 "MULTISCAN" ++#define CMD14 "FILDES" - #include - #include "cfgparser.h" + #include "libclamav/clamav.h" + #include "shared/cfgparser.h" diff --git a/security/clamav/patches/patch-clamdscan_client_c b/security/clamav/patches/patch-clamdscan_client_c index fa3eb5b1ed7..3fad5ef7510 100644 --- a/security/clamav/patches/patch-clamdscan_client_c +++ b/security/clamav/patches/patch-clamdscan_client_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-clamdscan_client_c,v 1.4 2006/08/15 18:48:22 mbalmer Exp $ ---- clamdscan/client.c.orig Thu Apr 20 10:52:19 2006 -+++ clamdscan/client.c Fri Jul 28 02:28:02 2006 -@@ -26,6 +26,7 @@ +$OpenBSD: patch-clamdscan_client_c,v 1.5 2007/02/28 20:31:08 mbalmer Exp $ +--- clamdscan/client.c.orig Sun Feb 11 01:20:56 2007 ++++ clamdscan/client.c Wed Feb 14 08:31:04 2007 +@@ -27,6 +27,7 @@ #include #include #include @@ -9,15 +9,15 @@ $OpenBSD: patch-clamdscan_client_c,v 1.4 2006/08/15 18:48:22 mbalmer Exp $ #include #include #include -@@ -294,18 +295,18 @@ int dsstream(int sockd, const struct opt - char *abpath(const char *filename) +@@ -288,18 +289,18 @@ static int dsstream(int sockd, const str + static char *abpath(const char *filename) { struct stat foo; - char *fullpath, cwd[200]; + char *fullpath, cwd[MAXPATHLEN]; if(stat(filename, &foo) == -1) { - mprintf("@Can't access file %s\n", filename); + logg("^Can't access file %s\n", filename); perror(filename); return NULL; } else { @@ -28,6 +28,6 @@ $OpenBSD: patch-clamdscan_client_c,v 1.4 2006/08/15 18:48:22 mbalmer Exp $ #else - if(!getcwd(cwd, 200)) { + if(!getcwd(cwd, sizeof(cwd))) { - mprintf("@Can't get absolute pathname of current working directory.\n"); + logg("^Can't get absolute pathname of current working directory.\n"); return NULL; } diff --git a/security/clamav/patches/patch-configure b/security/clamav/patches/patch-configure index 31fb6d83c37..70099a8c29e 100644 --- a/security/clamav/patches/patch-configure +++ b/security/clamav/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.5 2006/08/15 18:48:22 mbalmer Exp $ ---- configure.orig Sat Jul 1 13:12:52 2006 -+++ configure Mon Jul 31 20:02:42 2006 -@@ -11828,11 +11828,11 @@ cat >>conftest.$ac_ext <<_ACEOF +$OpenBSD: patch-configure,v 1.6 2007/02/28 20:31:08 mbalmer Exp $ +--- configure.orig Wed Feb 14 08:34:54 2007 ++++ configure Wed Feb 14 08:39:18 2007 +@@ -21659,11 +21659,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif @@ -15,25 +15,22 @@ $OpenBSD: patch-configure,v 1.5 2006/08/15 18:48:22 mbalmer Exp $ ; return 0; } -@@ -12248,6 +12248,8 @@ cat confdefs.h >>conftest.$ac_ext +@@ -22220,6 +22220,7 @@ _ACEOF + cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - $ac_includes_default +#include -+#include + #include + #include - _ACEOF - rm -f conftest.$ac_objext -@@ -13293,13 +13295,9 @@ _ACEOF +@@ -23140,11 +23141,9 @@ _ACEOF + ;; openbsd*) if test "$have_pthreads" = "yes"; then - LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread" - if test "$use_cr" = "no"; then -- CLAMD_LIBS="$CLAMD_LIBS -pthread" -- CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread" +- THREAD_LIBS="-pthread" - else -- CLAMD_LIBS="$CLAMD_LIBS -pthread -lc_r" -- CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread -lc_r" +- THREAD_LIBS="-pthread -lc_r" - fi + ADDITIONAL_LIBS="-pthread" + CLAMD_LIBS="$CLAMD_LIBS -pthread" @@ -41,7 +38,7 @@ $OpenBSD: patch-configure,v 1.5 2006/08/15 18:48:22 mbalmer Exp $ TH_SAFE="-thread-safe" cat >>confdefs.h <<\_ACEOF -@@ -14497,6 +14495,7 @@ cat confdefs.h >>conftest.$ac_ext +@@ -24218,6 +24217,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -49,7 +46,7 @@ $OpenBSD: patch-configure,v 1.5 2006/08/15 18:48:22 mbalmer Exp $ #include int allow_severity = 0; int deny_severity = 0; -@@ -14565,6 +14564,7 @@ cat confdefs.h >>conftest.$ac_ext +@@ -24270,6 +24270,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ diff --git a/security/clamav/patches/patch-etc-clamd_conf b/security/clamav/patches/patch-etc-clamd_conf index 3765e8ba7fa..1edcf6c38ab 100644 --- a/security/clamav/patches/patch-etc-clamd_conf +++ b/security/clamav/patches/patch-etc-clamd_conf @@ -1,5 +1,5 @@ ---- etc/clamd.conf.orig Wed Mar 29 07:01:45 2006 -+++ etc/clamd.conf Fri Jul 28 02:28:02 2006 +--- etc/clamd.conf.orig Mon Feb 12 19:18:42 2007 ++++ etc/clamd.conf Wed Feb 14 08:26:32 2007 @@ -11,7 +11,7 @@ Example # LogFile must be writable for the user running daemon. # A full path is required. @@ -8,7 +8,7 @@ +#LogFile /var/log/clamd.log # By default the log file is locked for writing - the lock protects against - # running clamd multiple times (if you want to run another clamd instance, + # running clamd multiple times (if want to run another clamd, please @@ -62,7 +62,7 @@ Example # Path to the database directory. diff --git a/security/clamav/patches/patch-etc-freshclam_conf b/security/clamav/patches/patch-etc-freshclam_conf index 96480296ec2..5b80398939c 100644 --- a/security/clamav/patches/patch-etc-freshclam_conf +++ b/security/clamav/patches/patch-etc-freshclam_conf @@ -1,6 +1,6 @@ ---- etc/freshclam.conf.orig Thu Apr 7 19:55:34 2005 -+++ etc/freshclam.conf Sun Apr 10 10:00:25 2005 -@@ -11,7 +11,7 @@ Example +--- etc/freshclam.conf.orig Sun Feb 11 10:54:46 2007 ++++ etc/freshclam.conf Wed Feb 14 08:26:32 2007 +@@ -10,7 +10,7 @@ Example # Path to the database directory. # WARNING: It must match clamd.conf's directive! # Default: hardcoded (depends on installation options) @@ -9,7 +9,7 @@ # Path to the log file (make sure it has proper permissions) # Default: disabled -@@ -37,7 +37,7 @@ Example +@@ -36,7 +36,7 @@ Example # By default when started freshclam drops privileges and switches to the # "clamav" user. This directive allows you to change the database owner. # Default: clamav (may depend on installation options) @@ -17,4 +17,4 @@ +#DatabaseOwner _clamav # Initialize supplementary group access (freshclam must be started by root). - # Default: disabled + # Default: no diff --git a/security/clamav/patches/patch-libclamav_Makefile_am b/security/clamav/patches/patch-libclamav_Makefile_am index de21db63e33..02c78c5044c 100644 --- a/security/clamav/patches/patch-libclamav_Makefile_am +++ b/security/clamav/patches/patch-libclamav_Makefile_am @@ -1,9 +1,9 @@ -$OpenBSD: patch-libclamav_Makefile_am,v 1.2 2006/08/15 18:48:22 mbalmer Exp $ ---- libclamav/Makefile.am.orig Sun Mar 26 13:04:57 2006 -+++ libclamav/Makefile.am Mon Jul 31 00:09:11 2006 -@@ -20,7 +20,7 @@ INCLUDES = -I$(top_srcdir) -I@srcdir@/zz +$OpenBSD: patch-libclamav_Makefile_am,v 1.3 2007/02/28 20:31:08 mbalmer Exp $ +--- libclamav/Makefile.am.orig Tue Feb 13 02:05:52 2007 ++++ libclamav/Makefile.am Wed Feb 14 08:26:32 2007 +@@ -21,7 +21,7 @@ INCLUDES = -I$(top_srcdir) -I@srcdir@/un - libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ + libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @THREAD_LIBS@ -libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ -no-undefined +libclamav_la_LDFLAGS = @TH_SAFE@ $(LIBclamav_LTVERSION) -no-undefined diff --git a/security/clamav/patches/patch-libclamav_Makefile_in b/security/clamav/patches/patch-libclamav_Makefile_in index 006eb3f7c72..8e0ea34b60f 100644 --- a/security/clamav/patches/patch-libclamav_Makefile_in +++ b/security/clamav/patches/patch-libclamav_Makefile_in @@ -1,12 +1,12 @@ -$OpenBSD: patch-libclamav_Makefile_in,v 1.2 2006/08/15 18:48:22 mbalmer Exp $ ---- libclamav/Makefile.in.orig Sat Jul 1 06:12:56 2006 -+++ libclamav/Makefile.in Mon Jul 31 00:10:52 2006 -@@ -220,7 +220,7 @@ target_os = @target_os@ +$OpenBSD: patch-libclamav_Makefile_in,v 1.3 2007/02/28 20:31:08 mbalmer Exp $ +--- libclamav/Makefile.in.orig Tue Feb 13 02:12:02 2007 ++++ libclamav/Makefile.in Wed Feb 14 08:33:02 2007 +@@ -236,7 +236,7 @@ target_os = @target_os@ target_vendor = @target_vendor@ - INCLUDES = -I$(top_srcdir) -I@srcdir@/zziplib -I@srcdir@/mspack - libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ + INCLUDES = -I$(top_srcdir) -I@srcdir@/unrar + libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @THREAD_LIBS@ -libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ -no-undefined -+libclamav_la_LDFLAGS = @TH_SAFE@ $(LIBclamav_LTVERSION) -no-undefined ++libclamav_la_LDFLAGS = @TH_SAFE@ $(LIBclamav_LTVERSION) @LIBCLAMAV_VERSION@ -no-undefined include_HEADERS = clamav.h libclamav_la_SOURCES = \ clamav.h \ diff --git a/security/clamav/patches/patch-libclamav_mbox_c b/security/clamav/patches/patch-libclamav_mbox_c index 0252970f316..3f78787182a 100644 --- a/security/clamav/patches/patch-libclamav_mbox_c +++ b/security/clamav/patches/patch-libclamav_mbox_c @@ -1,6 +1,6 @@ ---- libclamav/mbox.c.orig Thu Apr 7 19:50:25 2005 -+++ libclamav/mbox.c Sun Apr 10 10:00:25 2005 -@@ -25,11 +25,6 @@ static char const rcsid[] = "$Id: mbox.c +--- libclamav/mbox.c.orig Tue Feb 13 14:06:57 2007 ++++ libclamav/mbox.c Wed Feb 14 08:26:32 2007 +@@ -30,11 +30,6 @@ static char const rcsid[] = "$Id: mbox.c #define NDEBUG /* map CLAMAV debug onto standard */ #endif diff --git a/security/clamav/patches/patch-libclamav_ole2_extract_c b/security/clamav/patches/patch-libclamav_ole2_extract_c index 951017a524d..bfe7b427cd1 100644 --- a/security/clamav/patches/patch-libclamav_ole2_extract_c +++ b/security/clamav/patches/patch-libclamav_ole2_extract_c @@ -1,9 +1,9 @@ -$OpenBSD: patch-libclamav_ole2_extract_c,v 1.2 2005/12/24 20:52:58 sturm Exp $ ---- libclamav/ole2_extract.c.orig Wed Oct 26 00:49:11 2005 -+++ libclamav/ole2_extract.c Sat Dec 24 19:26:20 2005 -@@ -142,7 +142,7 @@ typedef struct property_tag +$OpenBSD: patch-libclamav_ole2_extract_c,v 1.3 2007/02/28 20:31:08 mbalmer Exp $ +--- libclamav/ole2_extract.c.orig Sun Feb 4 17:55:11 2007 ++++ libclamav/ole2_extract.c Wed Feb 14 08:26:32 2007 +@@ -128,7 +128,7 @@ typedef struct property_tag - unsigned char magic_id[] = { 0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1}; + static unsigned char magic_id[] = { 0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1}; -static char *get_property_name(char *name, int size) +static char *get_property_name(signed char *name, int size) diff --git a/security/clamav/patches/patch-libclamav_scanner_c b/security/clamav/patches/patch-libclamav_scanner_c index 23100cd8d8f..6f14e2dd543 100644 --- a/security/clamav/patches/patch-libclamav_scanner_c +++ b/security/clamav/patches/patch-libclamav_scanner_c @@ -1,6 +1,6 @@ ---- libclamav/scanners.c.orig Sat Jul 1 05:58:56 2006 -+++ libclamav/scanners.c Fri Jul 28 02:28:02 2006 -@@ -643,11 +643,6 @@ static int cli_scangzip(int desc, const +--- libclamav/scanners.c.orig Tue Feb 13 02:06:28 2007 ++++ libclamav/scanners.c Wed Feb 14 08:26:32 2007 +@@ -699,11 +699,6 @@ static int cli_scangzip(int desc, cli_ct #ifdef HAVE_BZLIB_H @@ -10,10 +10,10 @@ -#define BZ2_bzRead bzRead -#endif - static int cli_scanbzip(int desc, const char **virname, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, unsigned int arec, unsigned int mrec) + static int cli_scanbzip(int desc, cli_ctx *ctx) { -@@ -668,7 +663,7 @@ static int cli_scanbzip(int desc, const - if(limits->archivememlim) +@@ -725,7 +720,7 @@ static int cli_scanbzip(int desc, cli_ct + if(ctx->limits->archivememlim) memlim = 1; - if((bfd = BZ2_bzReadOpen(&bzerror, fs, 0, memlim, NULL, 0)) == NULL) { diff --git a/security/clamav/patches/patch-libclamav_str_c b/security/clamav/patches/patch-libclamav_str_c index f248eed0b6d..b1110ab9cec 100644 --- a/security/clamav/patches/patch-libclamav_str_c +++ b/security/clamav/patches/patch-libclamav_str_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-libclamav_str_c,v 1.1 2005/06/29 10:12:09 mbalmer Exp $ ---- libclamav/str.c.orig Wed Jun 29 11:31:49 2005 -+++ libclamav/str.c Wed Jun 29 11:32:23 2005 -@@ -92,8 +92,8 @@ short int *cli_hex2si(const char *hex) +$OpenBSD: patch-libclamav_str_c,v 1.2 2007/02/28 20:31:08 mbalmer Exp $ +--- libclamav/str.c.orig Sun Feb 11 01:35:22 2007 ++++ libclamav/str.c Wed Feb 14 08:26:32 2007 +@@ -97,8 +97,8 @@ short int *cli_hex2si(const char *hex) char *cli_hex2str(const char *hex) { @@ -12,7 +12,7 @@ $OpenBSD: patch-libclamav_str_c,v 1.1 2005/06/29 10:12:09 mbalmer Exp $ len = strlen(hex); -@@ -111,9 +111,9 @@ char *cli_hex2str(const char *hex) +@@ -116,9 +116,9 @@ char *cli_hex2str(const char *hex) for(i = 0; i < len; i += 2) { if((c = cli_hex2int(hex[i])) >= 0) { diff --git a/security/clamav/patches/patch-libclamav_vba_extract_c b/security/clamav/patches/patch-libclamav_vba_extract_c index 6d448f77912..cbfd5df5d2a 100644 --- a/security/clamav/patches/patch-libclamav_vba_extract_c +++ b/security/clamav/patches/patch-libclamav_vba_extract_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-libclamav_vba_extract_c,v 1.1 2005/06/29 10:12:09 mbalmer Exp $ ---- libclamav/vba_extract.c.orig Wed Jun 29 11:36:26 2005 -+++ libclamav/vba_extract.c Wed Jun 29 11:36:48 2005 -@@ -117,7 +117,7 @@ vba_version_t vba_version[] = { +$OpenBSD: patch-libclamav_vba_extract_c,v 1.2 2007/02/28 20:31:08 mbalmer Exp $ +--- libclamav/vba_extract.c.orig Wed Jan 31 19:07:33 2007 ++++ libclamav/vba_extract.c Wed Feb 14 08:26:32 2007 +@@ -101,7 +101,7 @@ vba_version_t vba_version[] = { 2 + /* type1 record count */ \ 2) /* unknown */ diff --git a/security/clamav/pkg/PLIST b/security/clamav/pkg/PLIST index b5c10f0e40c..42ec4d048ca 100644 --- a/security/clamav/pkg/PLIST +++ b/security/clamav/pkg/PLIST @@ -1,7 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.4 2005/05/12 14:55:21 mbalmer Exp $ +@comment $OpenBSD: PLIST,v 1.5 2007/02/28 20:31:08 mbalmer Exp $ @newgroup _clamav:539 @newuser _clamav:539:539:daemon:Clam AntiVirus:/nonexistent:/sbin/nologin bin/clamav-config +bin/clamconf bin/clamdscan bin/clamscan bin/freshclam @@ -11,6 +12,7 @@ lib/libclamav.a lib/libclamav.la lib/pkgconfig/ lib/pkgconfig/libclamav.pc +@man man/man1/clamconf.1 @man man/man1/clamdscan.1 @man man/man1/clamscan.1 @man man/man1/freshclam.1