From 3bae5aea8fc843b384452cb636866f4bf3faf995 Mon Sep 17 00:00:00 2001 From: heinz Date: Sun, 15 Jan 2006 22:27:27 +0000 Subject: [PATCH] Updated to version 4.40. This fixes PR pkg/30290 by Nicolas Joly so the latest DAT files are working again. - Moved included DAT-files to shares/examples/uvscan/. - Works with PKG_CONFIG=no. - PDF manual included in share/doc/uvscan/. - Some small improvements to update_dat.sh: Option "-h" shows the available options. All the "exit" statements use distinct values. Fixed a small logic bug (-z vs. -n). Changes according to McAfee's website: - Includes technology to combat the latest and future threats. - Improved detection and cleaning. - Support for many more Packed Executable formats in which known malware is often re-packaged for obfuscation purposes. - Specific detection and reporting of files compressed or packaged with known suspicious applications. - Enhancements to the emergency DAT file (EXTRA.DAT) structure allowing a larger DAT file size. - Enhancements to enable scanning of non-standard ZIP archives. --- security/uvscan/Makefile | 28 +++++++++++++--------------- security/uvscan/PLIST | 12 +++++++----- security/uvscan/distinfo | 8 ++++---- security/uvscan/files/update_dat.sh | 14 +++++++++----- 4 files changed, 33 insertions(+), 29 deletions(-) diff --git a/security/uvscan/Makefile b/security/uvscan/Makefile index 56a9b428afa6..5ab4d05add65 100644 --- a/security/uvscan/Makefile +++ b/security/uvscan/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.32 2006/01/06 16:44:04 joerg Exp $ +# $NetBSD: Makefile,v 1.33 2006/01/15 22:27:27 heinz Exp $ -DISTNAME= vlnx424e -PKGNAME= uvscan-4.24.1 -PKGREVISION= 1 +DISTNAME= vlnx440e +PKGNAME= uvscan-4.40 CATEGORIES= security -MASTER_SITES= http://download.nai.com/products/evaluation/virusscan/english/cmdline/linux/version_4.24/intel/ +MASTER_SITES= http://download.nai.com/products/evaluation/virusscan/english/cmdline/linux/v4.40/ EXTRACT_SUFX= .tar.Z MAINTAINER= tech-pkg@NetBSD.org @@ -24,6 +23,7 @@ CHECK_SHLIBS= NO WRKSRC= ${WRKDIR} NO_BUILD= yes +NO_CONFIGURE= yes LICENSE= uvscan-license RESTRICTED= "restrictive 30 day evaluation license" NO_BIN_ON_FTP= ${RESTRICTED} @@ -32,7 +32,7 @@ NO_SRC_ON_FTP= ${RESTRICTED} NO_SRC_ON_CDROM= ${RESTRICTED} DOCDIR= ${PREFIX}/share/doc/uvscan -DATDIR= ${PREFIX}/share/uvscan +EGDATDIR= ${PREFIX}/share/examples/uvscan UVSCANDIR= ${PREFIX}/libexec/uvscan DATFILES= clean.dat internet.dat names.dat scan.dat pkgdesc.ini @@ -41,10 +41,10 @@ DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL FILES_SUBST+= UVSCANDIR=${UVSCANDIR:Q} FILES_SUBST+= DATFILES=${DATFILES:Q} -CONF_FILES= ${DATDIR}/clean.dat ${UVSCANDIR}/clean.dat -CONF_FILES+= ${DATDIR}/names.dat ${UVSCANDIR}/names.dat -CONF_FILES+= ${DATDIR}/scan.dat ${UVSCANDIR}/scan.dat -OWN_DIRS= ${UVSCANDIR} +CONF_FILES= ${EGDATDIR}/clean.dat ${UVSCANDIR}/clean.dat +CONF_FILES+= ${EGDATDIR}/names.dat ${UVSCANDIR}/names.dat +CONF_FILES+= ${EGDATDIR}/scan.dat ${UVSCANDIR}/scan.dat +REQD_DIRS= ${UVSCANDIR} INSTALLATION_DIRS= bin man/man1 sbin @@ -68,8 +68,6 @@ post-extract: do-install: ${INSTALL_SCRIPT} ${WRKDIR}/update_dat ${PREFIX}/sbin ${INSTALL_MAN} ${WRKSRC}/uvscan.1 ${PREFIX}/man/man1 - - ${INSTALL_PROGRAM_DIR} ${UVSCANDIR} ${INSTALL_SCRIPT} ${WRKSRC}/uvscan ${UVSCANDIR} ${RM} -f ${PREFIX}/bin/uvscan ${LN} -sf ../${UVSCANDIR:S/${PREFIX}\///}/uvscan ${PREFIX}/bin/uvscan @@ -85,14 +83,14 @@ do-install: for file in license.dat messages.dat; do \ ${INSTALL_DATA} ${WRKSRC}/$${file} ${UVSCANDIR}; \ done - ${INSTALL_DATA_DIR} ${DATDIR} + ${INSTALL_DATA_DIR} ${EGDATDIR} for file in ${DATFILES}; do \ if [ -f ${WRKSRC}/$${file} ]; then \ - ${INSTALL_DATA} ${WRKSRC}/$${file} ${DATDIR}; \ + ${INSTALL_DATA} ${WRKSRC}/$${file} ${EGDATDIR}; \ fi; \ done ${INSTALL_DATA_DIR} ${DOCDIR} - for file in contact.txt license.txt ; do \ + for file in contact.txt e4400upg.pdf license.txt ; do \ ${INSTALL_DATA} ${WRKSRC}/$${file} ${DOCDIR}; \ done diff --git a/security/uvscan/PLIST b/security/uvscan/PLIST index ed2f47d16d43..7102530960c1 100644 --- a/security/uvscan/PLIST +++ b/security/uvscan/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2005/12/03 20:19:04 wiz Exp $ +@comment $NetBSD: PLIST,v 1.7 2006/01/15 22:27:27 heinz Exp $ bin/uvscan emul/linux/usr/local/lib/liblnxfv.so emul/linux/usr/local/lib/liblnxfv.so.4 @@ -10,9 +10,11 @@ libexec/uvscan/messages.dat man/man1/uvscan.1 sbin/update_dat share/doc/uvscan/contact.txt +share/doc/uvscan/e4400upg.pdf share/doc/uvscan/license.txt -share/uvscan/clean.dat -share/uvscan/names.dat -share/uvscan/scan.dat +share/examples/uvscan/clean.dat +share/examples/uvscan/names.dat +share/examples/uvscan/scan.dat +@dirrm emul/linux/usr/local/lib @dirrm share/doc/uvscan -@dirrm share/uvscan +@dirrm share/examples/uvscan diff --git a/security/uvscan/distinfo b/security/uvscan/distinfo index 93fcfc8ee019..e1928428ec23 100644 --- a/security/uvscan/distinfo +++ b/security/uvscan/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.5 2005/02/24 13:10:14 agc Exp $ +$NetBSD: distinfo,v 1.6 2006/01/15 22:27:27 heinz Exp $ -SHA1 (vlnx424e.tar.Z) = ab60091a790e5ac2f7c343158a2b599894f61c2e -RMD160 (vlnx424e.tar.Z) = 94ee339ed5eb1209d0bd830b93d0d48b02df1d4e -Size (vlnx424e.tar.Z) = 6958655 bytes +SHA1 (vlnx440e.tar.Z) = 867176cb5ea1b8e7f5f031a7d8bd38b0eac55024 +RMD160 (vlnx440e.tar.Z) = 64150f29f404251cdb49a480d4ece5284a23ebbe +Size (vlnx440e.tar.Z) = 9013085 bytes diff --git a/security/uvscan/files/update_dat.sh b/security/uvscan/files/update_dat.sh index 4cd244a95cf3..00f81f4ea5e6 100644 --- a/security/uvscan/files/update_dat.sh +++ b/security/uvscan/files/update_dat.sh @@ -18,10 +18,14 @@ SED="@SED@" progname=`${BASENAME} $0` -while getopts vf: arg; do +while getopts vhf: arg; do case $arg in v) verbose=1 ;; f) dat_tar="${OPTARG}" ;; + h) + echo "Usage: $0 [-h] [-f ] [-v]" + exit 0 + ;; esac done @@ -39,7 +43,7 @@ if [ -n "$dat_tar" ]; then if ! (${GTAR} -x -C ${TMPDIR} -f $dat_tar pkgdesc.ini >/dev/null); then ${ECHO} "$progname: unable to extract pkgdesc.ini" ${RM} -rf ${TMPDIR} - exit 1 + exit 2 fi curver=`${AWK} -F= '/Version/ { print $2; exit }' ${TMPDIR}/pkgdesc.ini | ${SED} -e 's/^.*\([0-9][0-9][0-9][0-9]\).*$/\1/'` else @@ -47,7 +51,7 @@ else if ! (cd ${TMPDIR}; ftp ${DAT_SITE}update.ini >/dev/null); then ${ECHO} "$progname: unable to fetch ${DAT_SITE}update.ini" ${RM} -rf ${TMPDIR} - exit 1 + exit 3 fi curver=`${AWK} -F= '/DATVersion/ { print $2; exit }' ${TMPDIR}/update.ini | ${SED} -e 's/^.*\([0-9][0-9][0-9][0-9]\).*$/\1/'` fi @@ -59,7 +63,7 @@ else fi if [ $curver -le $oldver ]; then - if [ -z "$verbose" ]; then + if [ -n "$verbose" ]; then ${ECHO} "$progname: VirusScan DAT files are current ($oldver)" fi else @@ -70,7 +74,7 @@ else else ${ECHO} "$progname: unable to fetch $dat_tar" ${RM} -rf ${TMPDIR} - exit 1 + exit 4 fi fi