From e2e2236f4d49eabecd4186a92f773df20e82c417 Mon Sep 17 00:00:00 2001 From: mbalmer Date: Sat, 25 Aug 2007 10:08:28 +0000 Subject: [PATCH] Update ClamAV to version 0.91.2. Note to -stable ports maintainers: This should probably be put into -stable since the ClamAV people do not provide virus data to outdated scan engines. ok simon --- security/clamav/Makefile | 13 +++++-------- security/clamav/distinfo | 10 +++++----- .../patches/patch-clamav_milter-clamav_milter_c | 8 ++++---- security/clamav/patches/patch-clamd_session_c | 10 +++++----- security/clamav/patches/patch-clamd_session_h | 8 ++++---- security/clamav/patches/patch-clamdscan_client_c | 10 +++++----- security/clamav/patches/patch-configure | 14 +++++++------- .../clamav/patches/patch-libclamav_Makefile_am | 8 ++++---- .../clamav/patches/patch-libclamav_Makefile_in | 10 +++++----- security/clamav/patches/patch-libclamav_mbox_c | 6 +++--- .../clamav/patches/patch-libclamav_ole2_extract_c | 8 ++++---- security/clamav/patches/patch-libclamav_scanner_c | 8 ++++---- security/clamav/patches/patch-libclamav_str_c | 10 +++++----- 13 files changed, 60 insertions(+), 63 deletions(-) diff --git a/security/clamav/Makefile b/security/clamav/Makefile index 9821f5d3d47..214e84accd7 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.31 2007/08/02 18:12:55 aanriot Exp $ +# $OpenBSD: Makefile,v 1.32 2007/08/25 10:08:28 mbalmer Exp $ COMMENT= virus scanner -DISTNAME= clamav-0.90.3 -PKGNAME= ${DISTNAME}p1 +DISTNAME= clamav-0.91.2 CATEGORIES= security -SHARED_LIBS= clamav 4.2 # .4.1 +SHARED_LIBS= clamav 5.0 HOMEPAGE= http://www.clamav.net/ @@ -16,10 +15,9 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c crypto idn milter pthread ssl wrap z +WANTLIB= c milter pthread wrap z LIB_DEPENDS= gmp.>=6::devel/gmp \ - curl.>=2::net/curl \ bz2.>=10::archivers/bzip2 \ iconv.>=4::converters/libiconv @@ -43,8 +41,7 @@ CONFIGURE_ARGS+= --disable-clamav \ --with-user=_clamav \ --with-group=_clamav \ --disable-cr \ - --with-dbdir=/var/db/clamav \ - --with-libcurl + --with-dbdir=/var/db/clamav NO_REGRESS= Yes diff --git a/security/clamav/distinfo b/security/clamav/distinfo index 93f45c89b00..60e25bba1f3 100644 --- a/security/clamav/distinfo +++ b/security/clamav/distinfo @@ -1,5 +1,5 @@ -MD5 (clamav-0.90.3.tar.gz) = 1CzPejLa63x8w8jCOneT6g== -RMD160 (clamav-0.90.3.tar.gz) = fdo1Qa/uhAPH+5iqgn8Utaeh1s4= -SHA1 (clamav-0.90.3.tar.gz) = 7DIrWtqc9bb669LYAJhVRe4tKPo= -SHA256 (clamav-0.90.3.tar.gz) = k5kT0VrQ3Fg7pgknSuYalI9PoYuEi9UD2Vj+rNqrVKQ= -SIZE (clamav-0.90.3.tar.gz) = 12496857 +MD5 (clamav-0.91.2.tar.gz) = KnJl0Xz6gMMoWJePFqP0ew== +RMD160 (clamav-0.91.2.tar.gz) = nhgaek/Qg3f/R2Y67Sf4zJckmiE= +SHA1 (clamav-0.91.2.tar.gz) = 8YAHwwRaHXiWetrYBcaTTUbKZBk= +SHA256 (clamav-0.91.2.tar.gz) = 2sneht/170yabkli2iSYjhqnSUiiG3+3t/7ReGfd8qA= +SIZE (clamav-0.91.2.tar.gz) = 13394538 diff --git a/security/clamav/patches/patch-clamav_milter-clamav_milter_c b/security/clamav/patches/patch-clamav_milter-clamav_milter_c index 271429d91ad..47a17c626a5 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 Mar 1 23:27:19 2007 -+++ clamav-milter/clamav-milter.c Tue Mar 13 09:27:54 2007 -@@ -1078,7 +1078,7 @@ main(int argc, char **argv) +--- clamav-milter/clamav-milter.c.orig Mon Aug 20 23:01:19 2007 ++++ clamav-milter/clamav-milter.c Sat Aug 25 09:35:06 2007 +@@ -1116,7 +1116,7 @@ main(int argc, char **argv) * uid == 0 for that */ on = 1; @@ -9,7 +9,7 @@ perror("setsockopt"); return EX_UNAVAILABLE; } -@@ -1100,7 +1100,7 @@ main(int argc, char **argv) +@@ -1138,7 +1138,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_session_c b/security/clamav/patches/patch-clamd_session_c index 86bf3330e81..313767ba92b 100644 --- a/security/clamav/patches/patch-clamd_session_c +++ b/security/clamav/patches/patch-clamd_session_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-clamd_session_c,v 1.3 2007/03/25 11:24:02 mbalmer Exp $ ---- clamd/session.c.orig Wed Feb 28 00:37:13 2007 -+++ clamd/session.c Tue Mar 13 09:37:42 2007 -@@ -60,8 +60,10 @@ int command(int desc, const struct cl_en +$OpenBSD: patch-clamd_session_c,v 1.4 2007/08/25 10:08:28 mbalmer Exp $ +--- clamd/session.c.orig Sat Mar 31 20:57:47 2007 ++++ clamd/session.c Sat Aug 25 09:35:06 2007 +@@ -59,8 +59,10 @@ int command(int desc, const struct cl_engine *engine, { char buff[1025]; int bread, opt; @@ -13,7 +13,7 @@ $OpenBSD: patch-clamd_session_c,v 1.3 2007/03/25 11:24:02 mbalmer Exp $ bread = readsock(desc, buff, sizeof(buff)-1, '\n', timeout, 0, 1); if(bread == -2) /* timeout */ return -2; -@@ -156,6 +158,29 @@ int command(int desc, const struct cl_en +@@ -155,6 +157,29 @@ int command(int desc, const struct cl_engine *engine, if(cfgopt(copt, "ExitOnOOM")->enabled) return COMMAND_SHUTDOWN; diff --git a/security/clamav/patches/patch-clamd_session_h b/security/clamav/patches/patch-clamd_session_h index 9cffdb34e43..d3d6d76176f 100644 --- a/security/clamav/patches/patch-clamd_session_h +++ b/security/clamav/patches/patch-clamd_session_h @@ -1,7 +1,7 @@ -$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 @@ +$OpenBSD: patch-clamd_session_h,v 1.3 2007/08/25 10:08:28 mbalmer Exp $ +--- clamd/session.h.orig Sat Mar 31 20:57:53 2007 ++++ clamd/session.h Sat Aug 25 09:35:06 2007 +@@ -37,6 +37,7 @@ #define CMD11 "SHUTDOWN" #define CMD12 "FD" #define CMD13 "MULTISCAN" diff --git a/security/clamav/patches/patch-clamdscan_client_c b/security/clamav/patches/patch-clamdscan_client_c index 39848fb428d..39466a119c9 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.6 2007/03/25 11:24:02 mbalmer Exp $ ---- clamdscan/client.c.orig Wed Feb 28 00:44:45 2007 -+++ clamdscan/client.c Tue Mar 13 09:33:36 2007 -@@ -27,6 +27,7 @@ +$OpenBSD: patch-clamdscan_client_c,v 1.7 2007/08/25 10:08:28 mbalmer Exp $ +--- clamdscan/client.c.orig Sat Mar 31 20:59:16 2007 ++++ clamdscan/client.c Sat Aug 25 09:35:06 2007 +@@ -26,6 +26,7 @@ #include #include #include @@ -9,7 +9,7 @@ $OpenBSD: patch-clamdscan_client_c,v 1.6 2007/03/25 11:24:02 mbalmer Exp $ #include #include #include -@@ -287,18 +288,18 @@ static int dsstream(int sockd, const str +@@ -286,18 +287,18 @@ static int dsstream(int sockd, const struct optstruct static char *abpath(const char *filename) { struct stat foo; diff --git a/security/clamav/patches/patch-configure b/security/clamav/patches/patch-configure index 6692a64bac2..4c1cf9045c7 100644 --- a/security/clamav/patches/patch-configure +++ b/security/clamav/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.9 2007/08/02 18:12:55 aanriot Exp $ ---- configure.orig Thu May 31 00:09:14 2007 -+++ configure Sun Jul 29 14:32:16 2007 -@@ -21664,11 +21664,11 @@ cat >>conftest.$ac_ext <<_ACEOF +$OpenBSD: patch-configure,v 1.10 2007/08/25 10:08:28 mbalmer Exp $ +--- configure.orig Tue Aug 21 00:58:23 2007 ++++ configure Sat Aug 25 09:35:06 2007 +@@ -21939,11 +21939,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif @@ -15,7 +15,7 @@ $OpenBSD: patch-configure,v 1.9 2007/08/02 18:12:55 aanriot Exp $ ; return 0; } -@@ -23178,11 +23178,9 @@ _ACEOF +@@ -23380,11 +23380,9 @@ _ACEOF ;; openbsd*) if test "$have_pthreads" = "yes"; then @@ -30,7 +30,7 @@ $OpenBSD: patch-configure,v 1.9 2007/08/02 18:12:55 aanriot Exp $ TH_SAFE="-thread-safe" cat >>confdefs.h <<\_ACEOF -@@ -24304,6 +24302,7 @@ cat confdefs.h >>conftest.$ac_ext +@@ -24506,6 +24504,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -38,7 +38,7 @@ $OpenBSD: patch-configure,v 1.9 2007/08/02 18:12:55 aanriot Exp $ #include int allow_severity = 0; int deny_severity = 0; -@@ -24356,6 +24355,7 @@ cat confdefs.h >>conftest.$ac_ext +@@ -24558,6 +24557,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ diff --git a/security/clamav/patches/patch-libclamav_Makefile_am b/security/clamav/patches/patch-libclamav_Makefile_am index 02c78c5044c..42d7c7f6afc 100644 --- a/security/clamav/patches/patch-libclamav_Makefile_am +++ b/security/clamav/patches/patch-libclamav_Makefile_am @@ -1,7 +1,7 @@ -$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 +$OpenBSD: patch-libclamav_Makefile_am,v 1.4 2007/08/25 10:08:28 mbalmer Exp $ +--- libclamav/Makefile.am.orig Wed Jul 11 00:47:26 2007 ++++ libclamav/Makefile.am Sat Aug 25 09:35:06 2007 +@@ -21,7 +21,7 @@ INCLUDES = -I$(top_srcdir) -I@srcdir@/unrar -I@srcdir@ libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @THREAD_LIBS@ diff --git a/security/clamav/patches/patch-libclamav_Makefile_in b/security/clamav/patches/patch-libclamav_Makefile_in index 8e0ea34b60f..1b98b1385b2 100644 --- a/security/clamav/patches/patch-libclamav_Makefile_in +++ b/security/clamav/patches/patch-libclamav_Makefile_in @@ -1,9 +1,9 @@ -$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@ +$OpenBSD: patch-libclamav_Makefile_in,v 1.4 2007/08/25 10:08:28 mbalmer Exp $ +--- libclamav/Makefile.in.orig Tue Aug 21 00:48:18 2007 ++++ libclamav/Makefile.in Sat Aug 25 09:35:06 2007 +@@ -238,7 +238,7 @@ target_os = @target_os@ target_vendor = @target_vendor@ - INCLUDES = -I$(top_srcdir) -I@srcdir@/unrar + INCLUDES = -I$(top_srcdir) -I@srcdir@/unrar -I@srcdir@/nsis 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) @LIBCLAMAV_VERSION@ -no-undefined diff --git a/security/clamav/patches/patch-libclamav_mbox_c b/security/clamav/patches/patch-libclamav_mbox_c index 3f78787182a..f923fc53333 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 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 +--- libclamav/mbox.c.orig Mon Jul 16 22:13:19 2007 ++++ libclamav/mbox.c Sat Aug 25 09:35:06 2007 +@@ -30,11 +30,6 @@ static char const rcsid[] = "$Id: mbox.c,v 1.381 2007/ #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 f381dda2346..b0445d7dbe4 100644 --- a/security/clamav/patches/patch-libclamav_ole2_extract_c +++ b/security/clamav/patches/patch-libclamav_ole2_extract_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-libclamav_ole2_extract_c,v 1.4 2007/03/25 11:24:02 mbalmer Exp $ ---- libclamav/ole2_extract.c.orig Fri Feb 23 21:31:20 2007 -+++ libclamav/ole2_extract.c Tue Mar 13 09:27:55 2007 -@@ -133,7 +133,7 @@ typedef struct property_tag +$OpenBSD: patch-libclamav_ole2_extract_c,v 1.5 2007/08/25 10:08:28 mbalmer Exp $ +--- libclamav/ole2_extract.c.orig Mon Aug 20 23:59:37 2007 ++++ libclamav/ole2_extract.c Sat Aug 25 09:35:06 2007 +@@ -137,7 +137,7 @@ typedef struct property_tag static unsigned char magic_id[] = { 0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1}; diff --git a/security/clamav/patches/patch-libclamav_scanner_c b/security/clamav/patches/patch-libclamav_scanner_c index ab24e19c79c..cc78796923d 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 Thu Mar 1 23:44:49 2007 -+++ libclamav/scanners.c Tue Mar 13 09:27:55 2007 -@@ -686,11 +686,6 @@ static int cli_scangzip(int desc, cli_ct +--- libclamav/scanners.c.orig Mon Jul 16 22:04:52 2007 ++++ libclamav/scanners.c Sat Aug 25 09:35:06 2007 +@@ -688,11 +688,6 @@ static int cli_scangzip(int desc, cli_ctx *ctx) #ifdef HAVE_BZLIB_H @@ -12,7 +12,7 @@ static int cli_scanbzip(int desc, cli_ctx *ctx) { -@@ -712,7 +707,7 @@ static int cli_scanbzip(int desc, cli_ct +@@ -714,7 +709,7 @@ static int cli_scanbzip(int desc, cli_ctx *ctx) if(ctx->limits->archivememlim) memlim = 1; diff --git a/security/clamav/patches/patch-libclamav_str_c b/security/clamav/patches/patch-libclamav_str_c index b1110ab9cec..cd9170ca66b 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.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) +$OpenBSD: patch-libclamav_str_c,v 1.3 2007/08/25 10:08:28 mbalmer Exp $ +--- libclamav/str.c.orig Sat Apr 28 19:28:23 2007 ++++ libclamav/str.c Sat Aug 25 09:35:06 2007 +@@ -123,8 +123,8 @@ uint16_t *cli_hex2ui(const char *hex) char *cli_hex2str(const char *hex) { @@ -12,7 +12,7 @@ $OpenBSD: patch-libclamav_str_c,v 1.2 2007/02/28 20:31:08 mbalmer Exp $ len = strlen(hex); -@@ -116,9 +116,9 @@ char *cli_hex2str(const char *hex) +@@ -142,9 +142,9 @@ char *cli_hex2str(const char *hex) for(i = 0; i < len; i += 2) { if((c = cli_hex2int(hex[i])) >= 0) {