From 5be2d3139dfb48c04c34b4e119c4b91059d4cd27 Mon Sep 17 00:00:00 2001 From: sthen Date: Fri, 10 Jun 2011 22:20:20 +0000 Subject: [PATCH] bugfix update to clamav 0.97.1 --- security/clamav/Makefile | 9 +++------ security/clamav/distinfo | 10 +++++----- security/clamav/patches/patch-etc-clamd_conf | 8 ++++---- security/clamav/patches/patch-libclamav_Makefile_in | 8 ++++---- security/clamav/pkg/PLIST | 3 ++- 5 files changed, 18 insertions(+), 20 deletions(-) diff --git a/security/clamav/Makefile b/security/clamav/Makefile index 335ffc8181f..19b26e231bc 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -1,12 +1,10 @@ -# $OpenBSD: Makefile,v 1.68 2011/06/02 17:09:32 kili Exp $ +# $OpenBSD: Makefile,v 1.69 2011/06/10 22:20:20 sthen Exp $ COMMENT= virus scanner -DISTNAME= clamav-0.97 - -REVISION= 0 +DISTNAME= clamav-0.97.1 CATEGORIES= security -SHARED_LIBS= clamav 18.0 \ +SHARED_LIBS= clamav 18.1 \ clamunrar 2.0 \ clamunrar_iface 2.0 @@ -24,7 +22,6 @@ WANTLIB= bz2 c ltdl m milter ncurses pthread stdc++ z BUILD_DEPENDS= devel/check -# XXX can this use llvm from ports rather than bundled? LIB_DEPENDS= archivers/bzip2 \ devel/libtool,-ltdl diff --git a/security/clamav/distinfo b/security/clamav/distinfo index 1dc47b64ca1..b080233e127 100644 --- a/security/clamav/distinfo +++ b/security/clamav/distinfo @@ -1,5 +1,5 @@ -MD5 (clamav-0.97.tar.gz) = YF7RMrL46J3xEGSt6isYOw== -RMD160 (clamav-0.97.tar.gz) = vDei2gPB2JI9qfKKfgUfbmfbhgM= -SHA1 (clamav-0.97.tar.gz) = aPWmc2s/Z9YIxAZO+Dl3eHfwkRU= -SHA256 (clamav-0.97.tar.gz) = 7F2IMDwKbh2OE1S2iujBhPrueYmqwR36z/Rm2eBHGTI= -SIZE (clamav-0.97.tar.gz) = 41834871 +MD5 (clamav-0.97.1.tar.gz) = Tz+3T/EJjCXu+OEHIUeMKQ== +RMD160 (clamav-0.97.1.tar.gz) = 5CiF6O05k4mE6jiykmoDl7IdzlE= +SHA1 (clamav-0.97.1.tar.gz) = GzpGZ9zCeLx+qzisvA81JpqgU4c= +SHA256 (clamav-0.97.1.tar.gz) = aenBAtVjSCZrZZfW1AGwpaIZDhWLeOde4FkfkEee0so= +SIZE (clamav-0.97.1.tar.gz) = 43913867 diff --git a/security/clamav/patches/patch-etc-clamd_conf b/security/clamav/patches/patch-etc-clamd_conf index 623bfef8959..a5c7055389c 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 Fri Nov 5 14:25:19 2010 -+++ etc/clamd.conf Tue Nov 30 20:13:07 2010 +--- etc/clamd.conf.orig Fri May 13 12:25:31 2011 ++++ etc/clamd.conf Thu Jun 9 10:55:20 2011 @@ -11,7 +11,7 @@ Example # LogFile must be writable for the user running daemon. # A full path is required. @@ -18,7 +18,7 @@ # Only load the official signatures published by the ClamAV project. # Default: no -@@ -187,7 +187,7 @@ Example +@@ -186,7 +186,7 @@ Example # Run as another user (clamd must be started by root for this option to work) # Default: don't drop privileges @@ -27,7 +27,7 @@ # Initialize supplementary group access (clamd must be started by root). # Default: no -@@ -410,7 +410,7 @@ Example +@@ -409,7 +409,7 @@ Example # deeply the process should be continued. # Note: setting this limit too high may result in severe damage to the system. # Default: 16 diff --git a/security/clamav/patches/patch-libclamav_Makefile_in b/security/clamav/patches/patch-libclamav_Makefile_in index 3742be377a0..5c8371e3499 100644 --- a/security/clamav/patches/patch-libclamav_Makefile_in +++ b/security/clamav/patches/patch-libclamav_Makefile_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-libclamav_Makefile_in,v 1.15 2010/10/25 23:36:38 sthen Exp $ ---- libclamav/Makefile.in.orig Mon Oct 25 16:52:31 2010 -+++ libclamav/Makefile.in Mon Oct 25 21:52:50 2010 +$OpenBSD: patch-libclamav_Makefile_in,v 1.16 2011/06/10 22:20:20 sthen Exp $ +--- libclamav/Makefile.in.orig Thu Jun 9 07:51:36 2011 ++++ libclamav/Makefile.in Thu Jun 9 10:55:20 2011 @@ -535,7 +535,7 @@ EXTRA_DIST = c++/Makefile.nollvm.in $(am__append_4) re jsparse/generated/keywords.h \ jsparse/future_reserved_words.list jsparse/keywords.list \ @@ -28,7 +28,7 @@ $OpenBSD: patch-libclamav_Makefile_in,v 1.15 2010/10/25 23:36:38 sthen Exp $ -no-undefined $(am__append_6) include_HEADERS = clamav.h libclamav_la_SOURCES = clamav.h matcher-ac.c matcher-ac.h matcher-bm.c \ -@@ -2314,6 +2314,9 @@ version.h: version.h.tmp +@@ -2323,6 +2323,9 @@ version.h: version.h.tmp fi version.h.tmp: diff --git a/security/clamav/pkg/PLIST b/security/clamav/pkg/PLIST index 3247e69107d..917fb1f701c 100644 --- a/security/clamav/pkg/PLIST +++ b/security/clamav/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.18 2011/05/11 08:24:40 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.19 2011/06/10 22:20:20 sthen Exp $ @newgroup _clamav:539 @newuser _clamav:539:539:daemon:Clam AntiVirus:/nonexistent:/sbin/nologin @extraunexec rm -fr /var/db/clamav/* @@ -22,6 +22,7 @@ lib/libclamunrar_iface.a lib/libclamunrar_iface.la lib/pkgconfig/ lib/pkgconfig/libclamav.pc +@man man/man1/clambc.1 @man man/man1/clamconf.1 @man man/man1/clamdscan.1 @man man/man1/clamdtop.1