security/uvscan does not work anymore with recent DAT files

[Nicolas Joly <njoly%pasteur.fr@localhost>]

Hi,

Once again, i discovered that `security/uvscan' does not work anymore
with recent DAT files ...

njoly@hal [~]> uvscan --version
Virus Scan for Linux v4.40.0
Copyright (c) 1992-2004 Networks Associates Technology Inc. All rights
reserved.
(408) 988-3832  EVALUATION COPY - Sep 23 2004

Scan engine v4.4.00 for Linux.
Virus data file v4400 created Oct 20 2004
Scanning for 104507 viruses, trojans and variants.
njoly@hal [~]> sudo /usr/pkg/sbin/update_dat
Fri Jul 13 19:40:08 CEST 2007 Successfully updated VirusScan DAT files
to 5074.
njoly@hal [~]> uvscan --version
Virus Scan for Linux v4.40.0
Copyright (c) 1992-2004 Networks Associates Technology Inc. All rights
reserved.
(408) 988-3832  EVALUATION COPY - Sep 23 2004
Missing or invalid DAT:  /usr/pkg/libexec/uvscan/scan.dat


Switching to the v5 engine do fix the problem ...

njoly@hal [security/uvscan]> uvscan --version
Virus Scan for Linux v5.10.0
Copyright (c) 1992-2006 McAfee, Inc. All rights reserved.
(408) 988-3832  EVALUATION COPY - May 26 2006

Scan engine v5.1.00 for Linux.
Virus data file v4777 created Jun 05 2006
Scanning for 194376 viruses, trojans and variants.

njoly@hal [security/uvscan]> sudo /usr/pkg/sbin/update_dat
Fri Jul 13 19:54:33 CEST 2007 Successfully updated VirusScan DAT files
to 5074.
njoly@hal [security/uvscan]> uvscan --version
Virus Scan for Linux v5.10.0
Copyright (c) 1992-2006 McAfee, Inc. All rights reserved.
(408) 988-3832  EVALUATION COPY - May 26 2006

Scan engine v5.1.00 for Linux.
Virus data file v5074 created Jul 13 2007
Scanning for 282816 viruses, trojans and variants.


Do the attached patch looks ok ?

-- 
Nicolas Joly

Biological Software and Databanks.
Institut Pasteur, Paris.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/uvscan/Makefile,v
retrieving revision 1.41
diff -u -r1.41 Makefile
--- Makefile    12 Nov 2006 02:27:39 -0000      1.41
+++ Makefile    13 Jul 2007 17:50:36 -0000
@@ -1,10 +1,9 @@
 # $NetBSD: Makefile,v 1.41 2006/11/12 02:27:39 rillig Exp $
 
-DISTNAME=              vlnx440e
-PKGNAME=               uvscan-4.40
-PKGREVISION=           1
+DISTNAME=              vlp4510e
+PKGNAME=               uvscan-5.10
 CATEGORIES=            security
-MASTER_SITES=          
http://download.nai.com/products/evaluation/virusscan/english/cmdline/linux/v4.40/
+MASTER_SITES=          
http://download.nai.com/products/evaluation/virusscan/english/cmdline/linux/v5.10/
 EXTRACT_SUFX=          .tar.Z
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
@@ -88,7 +87,7 @@
                fi;                                                     \
        done
        ${INSTALL_DATA_DIR} ${DOCDIR}
-       for file in contact.txt e4400upg.pdf license.txt ; do           \
+       for file in contact.txt e5100upg.pdf license.txt ; do           \
                ${INSTALL_DATA} ${WRKSRC}/$${file} ${DOCDIR};           \
        done
 
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/security/uvscan/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- PLIST       15 Jan 2006 22:27:27 -0000      1.7
+++ PLIST       13 Jul 2007 17:50:36 -0000
@@ -10,7 +10,7 @@
 man/man1/uvscan.1
 sbin/update_dat
 share/doc/uvscan/contact.txt
-share/doc/uvscan/e4400upg.pdf
+share/doc/uvscan/e5100upg.pdf
 share/doc/uvscan/license.txt
 share/examples/uvscan/clean.dat
 share/examples/uvscan/names.dat
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/security/uvscan/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo    15 Jan 2006 22:27:27 -0000      1.6
+++ distinfo    13 Jul 2007 17:50:36 -0000
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.6 2006/01/15 22:27:27 heinz Exp $
 
-SHA1 (vlnx440e.tar.Z) = 867176cb5ea1b8e7f5f031a7d8bd38b0eac55024
-RMD160 (vlnx440e.tar.Z) = 64150f29f404251cdb49a480d4ece5284a23ebbe
-Size (vlnx440e.tar.Z) = 9013085 bytes
+SHA1 (vlp4510e.tar.Z) = 05c991ed9c5e9d517b1e672e07ac7a44d36e0dd7
+RMD160 (vlp4510e.tar.Z) = fe3a10939782119f7fe094b3201015a5cb9d7051
+Size (vlp4510e.tar.Z) = 13465139 bytes