ports/64712: update: ports/security/amavisd-new

[Serge Negodyuck]

>Number:         64712
>Category:       ports
>Synopsis:       update: ports/security/amavisd-new
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 25 07:10:10 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Serge Negodyuck
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
System: FreeBSD petrovich.com.ua 4.9-STABLE 


>Description:

 amavis.conf says that amavis-new is no longer compatible with DrWebD since 4.31
 That is not true. 

 - Added an example how to use DrWebD 4.31

>How-To-Repeat:
	
>Fix:


--- files/patch-amavisd.conf.orig	Thu Mar 25 16:48:51 2004
+++ files/patch-amavisd.conf	Thu Mar 25 16:48:29 2004
@@ -1,5 +1,5 @@
---- amavisd.conf.orig	Mon Nov 10 00:07:53 2003
-+++ amavisd.conf	Tue Nov 11 22:48:05 2003
+--- amavisd.conf.orig	Tue Mar  9 04:21:38 2004
++++ amavisd.conf	Thu Mar 25 16:47:24 2004
 @@ -51,7 +51,7 @@
  # $MYHOME serves as a quick default for some other configuration settings.
  # More refined control is available with each individual setting further down.
@@ -9,7 +9,7 @@
  
  # $mydomain serves as a quick default for some other configuration settings.
  # More refined control is available with each individual setting further down.
-@@ -60,8 +60,8 @@
+@@ -62,8 +62,8 @@
  
  # Set the user and group to which the daemon will change if started as root
  # (otherwise just keeps the UID unchanged, and these settings have no effect):
@@ -20,7 +20,7 @@
  
  # Runtime working directory (cwd), and a place where
  # temporary directories for unpacking mail are created.
-@@ -274,7 +274,7 @@
+@@ -276,7 +276,7 @@
  # 3: server, client
  # 4: decompose parts
  # 5: more debug details
@@ -29,7 +29,7 @@
  
  # Customizable template for the most interesting log file entry (e.g. with
  # $log_level=0) (take care to properly quote Perl special characters like '\')
-@@ -510,7 +510,7 @@
+@@ -516,7 +516,7 @@
  #   or a directory (no trailing slash)
  #   (the default value is undef, meaning no quarantine)
  #
@@ -38,3 +38,27 @@
  
  #$virus_quarantine_method = "local:virus-%i-%n";    # default
  #$spam_quarantine_method  = "local:spam-%b-%i-%n";  # default
+@@ -1293,16 +1293,18 @@
+     '-path={} -al -go -ot -cn -upn -ok-',
+     [0,32], [1,33], qr' infected (?:with|by)(?: virus)? (.*)$'],
+ 
+-# NOTE: no longer compatible with DrWebD since 4.31
++# # NOTE: If you are using amavis-milter change length to:
++# # length("$TEMPBASE/amavis-milter-xxxxxxxxxxxxxx/parts/part-xxxxx").
++#
+ # ['Dr.Web Daemon', \&ask_daemon,
+-#   [pack('N',1).  # DRWEBD_SCAN_CMD - 1
+-#    pack('N',1).  # DRWEBD_RETURN_VIRUSES
++#   [pack('N',1).  # DRWEBD_SCAN_CMD = 1
++#    pack('N',1).  # DRWEBD_RETURN_VIRUSES = 1
+ #    pack('N',     # path length
+-#      length("$TEMPBASE/amavis-yyyymmddTHHMMSS-xxxxx/parts/part-xxxxx")).
++#      length("$TEMPBASE/amavis-client-xxxxxxxx/parts/part-xxxxx")).
+ #    '{}/*'.       # path
+ #    pack('N',0) . pack('N',0),
+ #    '/usr/local/drweb/run/drwebd.sock'],  # or e.g. /var/drweb/run/drwebd.sock
+-#   qr/^\x00(\x00|\x01)\x00\x00/,
++#   qr/^\x00(\x10|\x11)\x00\x00/,	# 0x00100000 - OK
+ #   qr/^\x00(\x00|\x01)\x00(\x20|\x40|\x80)/,
+ #   qr/infected with ([^\x00]+)\x00\z/
+ # ],

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