ports/146915: [MAINTAINER UPDATE] security/clamav-unofficial-sigs - fix installation of MalwarePatrol db

[Marko Njezic]

>Number:         146915
>Category:       ports
>Synopsis:       [MAINTAINER UPDATE] security/clamav-unofficial-sigs - fix installation of MalwarePatrol db
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 24 10:10:00 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Marko Njezic
>Release:        8.0-RELEASE-p2
>Organization:
MAX Interactive corp.
>Environment:
FreeBSD vmbsd 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Tue Jan  5 16:02:27 UTC 2010     root at i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
Bug fix for the installation of MalwarePatrol db file, which didn't get properly installed under certain conditions.

The patch has also been submitted upstream.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -Naur clamav-unofficial-sigs.original/Makefile clamav-unofficial-sigs/Makefile
--- clamav-unofficial-sigs.original/Makefile	2010-04-06 18:38:00.000000000 +0200
+++ clamav-unofficial-sigs/Makefile	2010-05-24 11:20:12.000000000 +0200
@@ -7,7 +7,7 @@
 
 PORTNAME=	clamav-unofficial-sigs
 PORTVERSION=	3.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://www.inetmsg.com/pub/ \
 		http://www.inetmsg.com/pub/archive/
diff -Naur clamav-unofficial-sigs.original/files/patch-clamav-unofficial-sigs.sh clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh
--- clamav-unofficial-sigs.original/files/patch-clamav-unofficial-sigs.sh	2010-03-09 23:34:08.000000000 +0100
+++ clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh	2010-05-24 11:19:48.000000000 +0200
@@ -1,5 +1,5 @@
 --- clamav-unofficial-sigs.sh	2010-01-24 02:38:29.000000000 +0100
-+++ clamav-unofficial-sigs.sh.patched	2010-03-06 08:52:32.000000000 +0100
++++ clamav-unofficial-sigs.sh.patched	2010-05-24 11:15:04.000000000 +0200
 @@ -19,7 +19,7 @@
  #                                                                              #
  ################################################################################
@@ -18,3 +18,18 @@
            if [ -n "$pkg_mgr" -a -n "$pkg_rm" ]
               then
                  echo "  This script (clamav-unofficial-sigs) was installed on the system"
+@@ -1227,11 +1229,11 @@
+                then
+                   if ! cmp -s $mbl_dir/$db_file $clam_dbs/$db_file 
+                      then
+-                        comment ""
+-                        comment "Testing updated MalwarePatrol database file: $db_file"
+-                        log "INFO - Testing updated database file: $db_file"
+                         if [ "$?" = "0" ] ; then
+                            db_ext=`echo $db_file | cut -d "." -f2`
++                           comment ""
++                           comment "Testing updated MalwarePatrol database file: $db_file"
++                           log "INFO - Testing updated database file: $db_file"
+                            if [ -z "$ham_dir" -o "$db_ext" != "ndb" ]
+                               then
+                                  if clamscan --quiet -d "$mbl_dir/$db_file" "$config_dir/scan-test.txt" 2>/dev/null


>Release-Note:
>Audit-Trail:
>Unformatted: