From nobody@FreeBSD.org  Mon Apr 14 20:10:19 2008
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 74A401065676
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 14 Apr 2008 20:10:19 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 64A7F8FC1E
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 14 Apr 2008 20:10:19 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m3EKAC6Y092772
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 14 Apr 2008 20:10:12 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.2/8.14.1/Submit) id m3EKACII092771;
	Mon, 14 Apr 2008 20:10:12 GMT
	(envelope-from nobody)
Message-Id: <200804142010.m3EKACII092771@www.freebsd.org>
Date: Mon, 14 Apr 2008 20:10:12 GMT
From: Michael Scheidell <scheidell@secnap.net>
To: freebsd-gnats-submit@FreeBSD.org
Subject: update: clamav to 0.93
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         122770
>Category:       ports
>Synopsis:       update: security/clamav to 0.93
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    garga
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 14 20:20:01 UTC 2008
>Closed-Date:    Wed Apr 16 16:11:32 UTC 2008
>Last-Modified:  Wed Apr 16 16:11:32 UTC 2008
>Originator:     Michael Scheidell
>Release:        6.3
>Organization:
SECNAP Network Security
>Environment:
na
>Description:
Clamav has been updated to 0.93, warning: two incompatibilities. options ArchiveMax* changed to Max*.  DBDIR/*.inc dirs not user, need *.cvd files or it won't even start.

patches TRY to address both issues.

0.93
----

This release introduces many new features and engine enhancements, please
see the notes below for the list of major changes. The most visible one
is the new logic in scan limits which affects some command line and config
options of clamscan and clamd. Please see clamscan(1) and clamd.conf(5)
and the example config file for more information on the new options.

Most important changes include:

  * libclamav:
    - New logic in scan limits: provides much more efficient protection against
Most important changes include:

  * libclamav:
    - New logic in scan limits: provides much more efficient protection against
      DoS attacks but also results in different command line and config options
      to clamscan and clamd (see below)
    - New/improved modules: unzip, SIS, cabinet, CHM, SZDD, text normalisator,
      entity converter
    - Improved filetype detection; filetype definitions can be remotely updated
    - Support for .cld containers (which replace .inc directories)
    - Improved pattern matcher and signature formats
    - More efficient scanning of HTML files
    - Many other improvements

  * clamd:
    - NEW CONFIG FILE OPTIONS: MaxScanSize, MaxFileSize, MaxRecursion, MaxFiles
    - ** THE FOLLOWING OPTIONS ARE NO LONGER SUPPORTED **: MailMaxRecursion,
      ArchiveMaxFileSize, ArchiveMaxRecursion, ArchiveMaxFiles,
      ArchiveMaxCompressionRatio, ArchiveBlockMax

  * clamscan:
    - NEW CMDLINE OPTIONS: --max-filesize, --max-scansize
    - REMOVED OPTIONS: --block-max, --max-space, --max-ratio

  * freshclam:
    - NEW CONFIG OPTION CompressLocalDatabase
    - NEW CMDLINE SWITCH --no-warnings
    - main.inc and daily.inc directories are no longer used by ClamAV; please
      remove them manually from your database directory

>How-To-Repeat:
install, 

(can't attach patch since you broke that translator or whatever funky thing you did)
>Fix:
and attached, since pr seems to trash either the web or attached patches.

diff -bBru /var/tmp/clamav/ ./
diff -bBru /var/tmp/clamav/Makefile ./Makefile
--- /var/tmp/clamav/Makefile    Thu Feb 21 08:19:50 2008
+++ ./Makefile  Mon Apr 14 15:16:20 2008
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=      clamav
-PORTVERSION=   0.92.1
-PORTREVISION=  1
+PORTVERSION=   0.93
 CATEGORIES=    security
 MASTER_SITES=  SF
 
@@ -91,7 +90,9 @@
                -e 's|^\#?(DatabaseDirectory) .*$$|\1 ${DBDIR}|' \
                -e 's|^\#?(DatabaseOwner) .*$$|\1 ${CLAMAVUSER}|' \
                -e 's|^\#?(FixStaleSocket).*$$|\1 yes|' \
-               -e 's|^\#?(NotifyClamd) .*$$|\1 ${PREFIX}/etc/clamd.conf|'
+               -e 's|^\#?(NotifyClamd) .*$$|\1 ${PREFIX}/etc/clamd.conf|' \
+               -e 's|ArchiveMax|Max|' \
+               -e 's|MailMaxRecursion|MaxRecursion|'
 
 PLIST_SUB+=    CLAMAVUSER=${CLAMAVUSER} \
                CLAMAVGROUP=${CLAMAVGROUP}
diff -bBru /var/tmp/clamav/distinfo ./distinfo
--- /var/tmp/clamav/distinfo    Wed Feb 13 10:37:27 2008
+++ ./distinfo  Mon Apr 14 13:57:11 2008
@@ -1,3 +1,3 @@
-MD5 (clamav-0.92.1.tar.gz) = c16e60f569b6ec575d8de494e788f9d2
-SHA256 (clamav-0.92.1.tar.gz) = e08a63adb3eda3dfc190d7a8b3fa55c881b1632583fbdf67327d3767d6966581
-SIZE (clamav-0.92.1.tar.gz) = 15284752
+MD5 (clamav-0.93.tar.gz) = 72ed6f4706858e72f24dda8a591df0da
+SHA256 (clamav-0.93.tar.gz) = 1fedc2bb4a850c962d6b0938b77b14480297bffa4cbf69ed95c4ee4f35b5db69
+SIZE (clamav-0.93.tar.gz) = 16134725
diff -bBru /var/tmp/clamav/files/clamav-clamd.in ./files/clamav-clamd.in
--- /var/tmp/clamav/files/clamav-clamd.in       Thu Apr  6 11:20:18 2006
+++ ./files/clamav-clamd.in     Mon Apr 14 15:43:29 2008
@@ -32,4 +32,16 @@
 : ${clamav_clamd_flags=""}
 : ${clamav_clamd_socket="%%CLAMAV_CLAMD_SOCKET%%"}
 
+start_precmd=clamav_clamd_precmd
+
+# clamav .93 won't start without a valid main.cvd file
+clamav_clamd_precmd() {
+   if [ ! -f %%DBDIR%%/main.cvd ];then
+      echo "Missing %%DBDIR%%/clamav/*.cvd files.  You must run freshclam first"
+      return 1
+   fi
+}
+
 run_rc_command "$1"
+
+


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->garga 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Apr 14 22:20:02 UTC 2008 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=122770 

From: Christian Kratzer <ck@cksoft.de>
To: bug-followup@FreeBSD.org
Cc: Christian Kratzer <ck@cksoft.de>, Michael Scheidell <scheidell@secnap.net>
Subject: Re: ports/122770: update: clamav to 0.93
Date: Tue, 15 Apr 2008 13:57:45 +0200 (CEST)

   This message is in MIME format.  The first part should be readable text,
   while the remaining parts are likely unreadable without MIME-aware tools.
 
 --0-19799429-1208260665=:63381
 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
 
 Hi,
 
 I have two issues with the patch attached to this pr.
 
 1. Tabs converted to spaces causing patch to fail on 2 hunks in Makefile.
 
 2. pkg-plist was not updated to respect the shared library version bump from .3 to .4.
 
  	-lib/libclamav.so.3
  	+lib/libclamav.so.4
 
  	-%%UNRAR%%lib/libclamunrar.so.3
  	+%%UNRAR%%lib/libclamunrar.so.4
 
  	-%%UNRAR%%lib/libclamunrar_iface.so.3
  	+%%UNRAR%%lib/libclamunrar_iface.so.4
 
 Please check for plist correctnes next time before submitting a ports pr.
 
 I have attached an updated patch that adresses above 2 issues.
 
 Greetings
 Christian
 
 -- 
 Christian Kratzer                      CK Software GmbH
 Email:   ck@cksoft.de                  Schwarzwaldstr. 31
 Phone:   +49 7452 889 135              D-71131 Jettingen
 Fax:     +49 7452 889 136              HRB 245288, Amtsgericht Stuttgart
 Web:     http://www.cksoft.de/         Geschaeftsfuehrer: Christian Kratzer
 --0-19799429-1208260665=:63381
 Content-Type: TEXT/PLAIN; charset=US-ASCII; name=clamav-0.93.patch-2
 Content-Transfer-Encoding: BASE64
 Content-ID: <20080415135745.Q63381@tapio.cksoft.de>
 Content-Description: 
 Content-Disposition: attachment; filename=clamav-0.93.patch-2
 
 SW5kZXg6IE1ha2VmaWxlDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1Mg
 ZmlsZTogL2V4cG9ydC9tZWRpYS9GcmVlQlNEL2N2c3VwL3IvcGN2cy9wb3J0
 cy9zZWN1cml0eS9jbGFtYXYvTWFrZWZpbGUsdg0KcmV0cmlldmluZyByZXZp
 c2lvbiAxLjEwOQ0KZGlmZiAtdSAtcCAtcjEuMTA5IE1ha2VmaWxlDQotLS0g
 TWFrZWZpbGUJMjEgRmViIDIwMDggMTM6MTk6NTAgLTAwMDAJMS4xMDkNCisr
 KyBNYWtlZmlsZQkxNSBBcHIgMjAwOCAxMTozMToyMCAtMDAwMA0KQEAgLTYs
 OCArNiw3IEBADQogIw0KIA0KIFBPUlROQU1FPQljbGFtYXYNCi1QT1JUVkVS
 U0lPTj0JMC45Mi4xDQotUE9SVFJFVklTSU9OPQkxDQorUE9SVFZFUlNJT049
 CTAuOTMNCiBDQVRFR09SSUVTPQlzZWN1cml0eQ0KIE1BU1RFUl9TSVRFUz0J
 U0YNCiANCkBAIC05MSw3ICs5MCw5IEBAIFNFRF9DT05GPQktRSAtZSAnc3xe
 XCM/KEV4YW1wbGUpJCR8XCNcMXwNCiAJCS1lICdzfF5cIz8oRGF0YWJhc2VE
 aXJlY3RvcnkpIC4qJCR8XDEgJHtEQkRJUn18JyBcDQogCQktZSAnc3xeXCM/
 KERhdGFiYXNlT3duZXIpIC4qJCR8XDEgJHtDTEFNQVZVU0VSfXwnIFwNCiAJ
 CS1lICdzfF5cIz8oRml4U3RhbGVTb2NrZXQpLiokJHxcMSB5ZXN8JyBcDQot
 CQktZSAnc3xeXCM/KE5vdGlmeUNsYW1kKSAuKiQkfFwxICR7UFJFRklYfS9l
 dGMvY2xhbWQuY29uZnwnDQorCQktZSAnc3xeXCM/KE5vdGlmeUNsYW1kKSAu
 KiQkfFwxICR7UFJFRklYfS9ldGMvY2xhbWQuY29uZnwnIFwNCisJCS1lICdz
 fEFyY2hpdmVNYXh8TWF4fCcgXA0KKwkJLWUgJ3N8TWFpbE1heFJlY3Vyc2lv
 bnxNYXhSZWN1cnNpb258Jw0KIA0KIFBMSVNUX1NVQis9CUNMQU1BVlVTRVI9
 JHtDTEFNQVZVU0VSfSBcDQogCQlDTEFNQVZHUk9VUD0ke0NMQU1BVkdST1VQ
 fQ0KSW5kZXg6IGRpc3RpbmZvDQo9PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpS
 Q1MgZmlsZTogL2V4cG9ydC9tZWRpYS9GcmVlQlNEL2N2c3VwL3IvcGN2cy9w
 b3J0cy9zZWN1cml0eS9jbGFtYXYvZGlzdGluZm8sdg0KcmV0cmlldmluZyBy
 ZXZpc2lvbiAxLjQ1DQpkaWZmIC11IC1wIC1yMS40NSBkaXN0aW5mbw0KLS0t
 IGRpc3RpbmZvCTEzIEZlYiAyMDA4IDE1OjM3OjI3IC0wMDAwCTEuNDUNCisr
 KyBkaXN0aW5mbwkxNSBBcHIgMjAwOCAxMTozMToyMCAtMDAwMA0KQEAgLTEs
 MyArMSwzIEBADQotTUQ1IChjbGFtYXYtMC45Mi4xLnRhci5neikgPSBjMTZl
 NjBmNTY5YjZlYzU3NWQ4ZGU0OTRlNzg4ZjlkMg0KLVNIQTI1NiAoY2xhbWF2
 LTAuOTIuMS50YXIuZ3opID0gZTA4YTYzYWRiM2VkYTNkZmMxOTBkN2E4YjNm
 YTU1Yzg4MWIxNjMyNTgzZmJkZjY3MzI3ZDM3NjdkNjk2NjU4MQ0KLVNJWkUg
 KGNsYW1hdi0wLjkyLjEudGFyLmd6KSA9IDE1Mjg0NzUyDQorTUQ1IChjbGFt
 YXYtMC45My50YXIuZ3opID0gNzJlZDZmNDcwNjg1OGU3MmYyNGRkYThhNTkx
 ZGYwZGENCitTSEEyNTYgKGNsYW1hdi0wLjkzLnRhci5neikgPSAxZmVkYzJi
 YjRhODUwYzk2MmQ2YjA5MzhiNzdiMTQ0ODAyOTdiZmZhNGNiZjY5ZWQ5NWM0
 ZWU0ZjM1YjVkYjY5DQorU0laRSAoY2xhbWF2LTAuOTMudGFyLmd6KSA9IDE2
 MTM0NzI1DQpJbmRleDogcGtnLXBsaXN0DQo9PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09DQpSQ1MgZmlsZTogL2V4cG9ydC9tZWRpYS9GcmVlQlNEL2N2c3VwL3Iv
 cGN2cy9wb3J0cy9zZWN1cml0eS9jbGFtYXYvcGtnLXBsaXN0LHYNCnJldHJp
 ZXZpbmcgcmV2aXNpb24gMS4zNA0KZGlmZiAtdSAtcCAtcjEuMzQgcGtnLXBs
 aXN0DQotLS0gcGtnLXBsaXN0CTE5IERlYyAyMDA3IDIzOjA4OjM2IC0wMDAw
 CTEuMzQNCisrKyBwa2ctcGxpc3QJMTUgQXByIDIwMDggMTE6MzE6MjAgLTAw
 MDANCkBAIC05LDE1ICs5LDE1IEBAIGJpbi9zaWd0b29sDQogc2Jpbi9jbGFt
 ZA0KIGluY2x1ZGUvY2xhbWF2LmgNCiBpbmNsdWRlL2NsYW1hdi1jb25maWcu
 aA0KLWxpYi9saWJjbGFtYXYuc28uMw0KK2xpYi9saWJjbGFtYXYuc28uNA0K
 IGxpYi9saWJjbGFtYXYuc28NCiBsaWIvbGliY2xhbWF2LmENCiBsaWIvbGli
 Y2xhbWF2LmxhDQotJSVVTlJBUiUlbGliL2xpYmNsYW11bnJhci5zby4zDQor
 JSVVTlJBUiUlbGliL2xpYmNsYW11bnJhci5zby40DQogJSVVTlJBUiUlbGli
 L2xpYmNsYW11bnJhci5zbw0KICUlVU5SQVIlJWxpYi9saWJjbGFtdW5yYXIu
 bGENCiAlJVVOUkFSJSVsaWIvbGliY2xhbXVucmFyLmENCi0lJVVOUkFSJSVs
 aWIvbGliY2xhbXVucmFyX2lmYWNlLnNvLjMNCislJVVOUkFSJSVsaWIvbGli
 Y2xhbXVucmFyX2lmYWNlLnNvLjQNCiAlJVVOUkFSJSVsaWIvbGliY2xhbXVu
 cmFyX2lmYWNlLnNvDQogJSVVTlJBUiUlbGliL2xpYmNsYW11bnJhcl9pZmFj
 ZS5sYQ0KICUlVU5SQVIlJWxpYi9saWJjbGFtdW5yYXJfaWZhY2UuYQ0KSW5k
 ZXg6IGZpbGVzL2NsYW1hdi1jbGFtZC5pbg0KPT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PQ0KUkNTIGZpbGU6IC9leHBvcnQvbWVkaWEvRnJlZUJTRC9jdnN1cC9y
 L3BjdnMvcG9ydHMvc2VjdXJpdHkvY2xhbWF2L2ZpbGVzL2NsYW1hdi1jbGFt
 ZC5pbix2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMQ0KZGlmZiAtdSAtcCAt
 cjEuMSBjbGFtYXYtY2xhbWQuaW4NCi0tLSBmaWxlcy9jbGFtYXYtY2xhbWQu
 aW4JNiBBcHIgMjAwNiAxNToyMDoxOCAtMDAwMAkxLjENCisrKyBmaWxlcy9j
 bGFtYXYtY2xhbWQuaW4JMTUgQXByIDIwMDggMTE6MzE6MjAgLTAwMDANCkBA
 IC0zMiw0ICszMiwxNiBAQCBsb2FkX3JjX2NvbmZpZyAiJG5hbWUiDQogOiAk
 e2NsYW1hdl9jbGFtZF9mbGFncz0iIn0NCiA6ICR7Y2xhbWF2X2NsYW1kX3Nv
 Y2tldD0iJSVDTEFNQVZfQ0xBTURfU09DS0VUJSUifQ0KIA0KK3N0YXJ0X3By
 ZWNtZD1jbGFtYXZfY2xhbWRfcHJlY21kDQorDQorIyBjbGFtYXYgLjkzIHdv
 bid0IHN0YXJ0IHdpdGhvdXQgYSB2YWxpZCBtYWluLmN2ZCBmaWxlDQorY2xh
 bWF2X2NsYW1kX3ByZWNtZCgpIHsNCisgICBpZiBbICEgLWYgJSVEQkRJUiUl
 L21haW4uY3ZkIF07dGhlbg0KKyAgICAgIGVjaG8gIk1pc3NpbmcgJSVEQkRJ
 UiUlL2NsYW1hdi8qLmN2ZCBmaWxlcy4gIFlvdSBtdXN0IHJ1biBmcmVzaGNs
 YW0gZmlyc3QiDQorICAgICAgcmV0dXJuIDENCisgICBmaQ0KK30NCisNCiBy
 dW5fcmNfY29tbWFuZCAiJDEiDQorDQorDQo=
 
 --0-19799429-1208260665=:63381--

From: Renato Botelho <garga@FreeBSD.org>
To: bug-followup@freebsd.org, scheidell@secnap.net
Cc:  
Subject: Re: ports/122770: update: security/clamav to 0.93
Date: Tue, 15 Apr 2008 09:26:29 -0300

 The update is not so easy as it seems, since library version has changed
 (from .3 to .4), all dependant ports need to be tested, and fixed if it's
 necessary, and it takes some time.
 
 I'm working on this right now and expect to commit it today yet.
 
 Thanks
 -- 
 Renato Botelho <garga @ FreeBSD.org>
                <garga @ freebsdbrasil.com.br>
 GnuPG Key: http://www.FreeBSD.org/~garga/pubkey.asc
 
 Nobody's gonna believe that computers are intelligent until they start
 coming in late and lying about it.

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/122770: commit references a PR
Date: Wed, 16 Apr 2008 16:06:05 +0000 (UTC)

 garga       2008-04-16 16:05:54 UTC
 
   FreeBSD ports repository
 
   Modified files:
     security/clamav      Makefile distinfo pkg-plist 
     security/clamav/files clamav-clamd.in 
   Log:
   - Update to 0.93
   
   This version fixes lock problem reported at ports/122534
   
   Most important changes:
    *libclamav:
      - New logic in scan limits: provides much more efficient protection against
        DoS attacks but also results in different command line and config options
        to clamscan and clamd (see below)
      - New/improved modules: unzip, SIS, cabinet, CHM, SZDD, text normalisator,
        entity converter
      - Improved filetype detection; filetype definitions can be remotely updated
      - Support for .cld containers (which replace .inc directories)
      - Improved pattern matcher and signature formats
      - More efficient scanning of HTML files
      - Many other improvements
   
    * clamd:
      - NEW CONFIG FILE OPTIONS: MaxScanSize, MaxFileSize, MaxRecursion, MaxFiles
      - ** THE FOLLOWING OPTIONS ARE NO LONGER SUPPORTED **: MailMaxRecursion,
        ArchiveMaxFileSize, ArchiveMaxRecursion, ArchiveMaxFiles,
        ArchiveMaxCompressionRatio, ArchiveBlockMax
   
    * clamscan:
      - NEW CMDLINE OPTIONS: --max-filesize, --max-scansize
      - REMOVED OPTIONS: --block-max, --max-space, --max-ratio
   
    * freshclam:
      - NEW CONFIG OPTION CompressLocalDatabase
      - NEW CMDLINE SWITCH --no-warnings
      - main.inc and daily.inc directories are no longer used by ClamAV; please
        remove them manually from your database directory
   
   PR:             ports/122770 [1] (based on)
                   ports/122534 [2]
   Submitted by:   Michael Scheidell <scheidell@secnap.net> [1]
                   Sebastian Inacker <inacker@fmsweb.de> [2]
   Security:       http://secunia.com/advisories/29000
   
   Revision  Changes    Path
   1.110     +1 -2      ports/security/clamav/Makefile
   1.46      +3 -3      ports/security/clamav/distinfo
   1.2       +11 -1     ports/security/clamav/files/clamav-clamd.in
   1.35      +4 -4      ports/security/clamav/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: garga 
State-Changed-When: Wed Apr 16 16:11:31 UTC 2008 
State-Changed-Why:  
port committed. thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=122770 
>Unformatted:
