maintainer-update: security/clamav to 0.54

PR:		ports/47291
Submitted by:	TERAMOTO Masahiro <markun@onohara.to>

6 files changed, 56 insertions, 6 deletions

diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 0a49f0bd7458..56c8ab30a97a 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clamav
-PORTVERSION=	0.20
+PORTVERSION=	0.54
 CATEGORIES=	security
 MASTER_SITES=	http://clamav.elektrapro.com/stable/
 
@@ -24,10 +24,18 @@ HAS_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--prefix=${PREFIX} --disable-clamav --disable-pthreads
 
-MAN1=		clamscan.1 freshclam.1 sigtool.1
+MAN1=		clamscan.1 freshclam.1 sigtool.1 clamdscan.1
+MAN5=		clamav.conf.5
+MAN8=		clamd.8
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500000
+EXTRA_PATCHES=	${FILESDIR}/patch5-*
+.endif
 
 pre-install:
 	@${ECHO} "==>  Creating custom user to run clamav..."
-	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+#	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/security/clamav/distinfo b/security/clamav/distinfo
index 95bc892bb3c2..e03f0969c789 100644
--- a/security/clamav/distinfo
+++ b/security/clamav/distinfo
@@ -1 +1 @@
-MD5 (clamav-0.20.tar.gz) = db747de22829b2d03baeb04d659d3d5b
+MD5 (clamav-0.54.tar.gz) = 1c2e2adffe9ed4d15fe2167dd7bad591
diff --git a/security/clamav/files/patch5-libclamav::zziplib::zzip-file.c b/security/clamav/files/patch5-libclamav::zziplib::zzip-file.c
new file mode 100644
index 000000000000..234f1ce5af2c
--- /dev/null
+++ b/security/clamav/files/patch5-libclamav::zziplib::zzip-file.c
@@ -0,0 +1,26 @@
+--- libclamav/zziplib/zzip-file.c.orig	Wed Feb  5 04:32:11 2003
++++ libclamav/zziplib/zzip-file.c	Wed Feb  5 04:35:05 2003
+@@ -11,6 +11,7 @@
+  *          that can be found in COPYING.ZZIP
+  */
+ 
++#include <strings.h>
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <errno.h>
+@@ -94,7 +95,6 @@
+     return 0;
+ }
+ 
+-
+ static int zzip_inflate_init(ZZIP_FILE *, struct zzip_dir_hdr *);
+ 
+ /**
+@@ -113,6 +113,7 @@
+     struct zzip_dir_hdr * hdr = dir->hdr0;
+     int (*cmp)(zzip_char_t*, zzip_char_t*);
+  
++    (void)strcasecmp("","");
+     cmp = (o_mode & ZZIP_CASEINSENSITIVE)? strcasecmp: strcmp;
+ 
+     if (o_mode & ZZIP_IGNOREPATH)
diff --git a/security/clamav/files/patch5-libclamav::zziplib::zzip-stat.c b/security/clamav/files/patch5-libclamav::zziplib::zzip-stat.c
new file mode 100644
index 000000000000..745fdb031292
--- /dev/null
+++ b/security/clamav/files/patch5-libclamav::zziplib::zzip-stat.c
@@ -0,0 +1,10 @@
+--- libclamav/zziplib/zzip-stat.c.orig	Wed Feb  5 04:36:09 2003
++++ libclamav/zziplib/zzip-stat.c	Wed Feb  5 04:36:32 2003
+@@ -32,6 +32,7 @@
+     struct zzip_dir_hdr * hdr = dir->hdr0;
+     int (*cmp)(zzip_char_t*, zzip_char_t*);
+ 
++    (void)strcasecmp("","");
+     cmp = (flags & ZZIP_CASEINSENSITIVE) ? strcasecmp : strcmp;
+ 
+     if (flags & ZZIP_IGNOREPATH)
diff --git a/security/clamav/pkg-descr b/security/clamav/pkg-descr
index 45535e0c7d29..c6f97f58b9be 100644
--- a/security/clamav/pkg-descr
+++ b/security/clamav/pkg-descr
@@ -1,3 +1,3 @@
 Clam Antivirus is command line virus scanner using database from
-OpenAntiVirus. It detects over 1700 viruses, scans compressed files
+OpenAntiVirus. It detects over 7000 viruses, scans compressed files
 and supported by AMaViS.
diff --git a/security/clamav/pkg-plist b/security/clamav/pkg-plist
index 2ea043885368..078a2b5937b2 100644
--- a/security/clamav/pkg-plist
+++ b/security/clamav/pkg-plist
@@ -1,5 +1,11 @@
 bin/clamscan
 bin/freshclam
 bin/sigtool
+include/clamav.h
+lib/libclamav.so.1
+lib/libclamav.so
+lib/libclamav.la
+lib/libclamav.a
 share/clamav/viruses.db
+share/clamav/viruses.db2
 @dirrm share/clamav