- Update to 4.32.2

- Pass maintainer to submitter

PR:		ports/72510
Submitted by:	maintainer

3 files changed, 104 insertions, 106 deletions

diff --git a/security/drweb/files/patch-aa b/security/drweb/files/patch-aa
index 70fa34fa66de..804887486496 100644
--- a/security/drweb/files/patch-aa
+++ b/security/drweb/files/patch-aa
@@ -1,6 +1,6 @@
---- usr/local/etc/drweb/drweb32.ini.orig	Sat Mar  6 04:06:07 2004
-+++ usr/local/etc/drweb/drweb32.ini	Sat Mar  6 21:58:17 2004
-@@ -7,23 +7,23 @@
+--- usr/local/etc/drweb/drweb32.ini.orig	Thu Oct  7 17:04:33 2004
++++ usr/local/etc/drweb/drweb32.ini	Thu Oct  7 17:22:05 2004
+@@ -15,34 +15,34 @@
  ;        also used by the updating module to update the search module. You
  ;        may specify relational path, but it is strongly recommended to make
  ;        it absolute.
@@ -11,8 +11,21 @@
  ;        Masks for the loaded virus bases. This parameter is also used by
  ;        the updating module to update antivirus' bases. A few masks can be
  ;        enumerated.
--VirusBase = "/var/drweb/bases/*.vdb"
-+VirusBase = "%INSTALL%/bases/*.vdb"
+-VirusBase = "/var/drweb/bases/*.vdb", "/var/drweb/bases/*.VDB"
++VirusBase = "%INSTALL%/bases/*.vdb", "%INSTALL%/bases/*.VDB"
+ 
+ ;UpdatePath = { path }
+ ;       This parameter is used by update script. This is a place for files
+ ;       (except drweb32.dll and bases) has been downloaded by update script.
+-UpdatePath = "/var/drweb/updates"
++UpdatePath = "%INSTALL%/updates"
+ 
+ ;TempPath = { path }
+ ;       This path is used by antivirus engine for creating temporary files. 
+ ;       /tmp would been used if TempPath is not defined. 
+ ;       Normally, the daemon attempts to avoid using of TempPath.
+-TempPath = "/var/drweb/spool"
++TempPath = "/tmp"
  
  ;LngFileName = { path to the language resource file, usual extension - dwl }
  ;        Localization file location.
@@ -23,44 +36,21 @@
  ;        Location of the file with the registration key. You may specify
  ;        relational path, but it is strongly recommended to make it
  ;        absolute.
--Key = "/usr/local/drweb/drwebd.key"
-+Key = "%INSTALL%/drwebd.key"
- 
- ; --- Scanning settings: ---
- 
-@@ -96,7 +96,7 @@
- ;        of their importance, you can find out where the daemon's report will
- ;        be written to, basing on these two parameters and the contents of
- ;        the configuration file syslog (usually /etc/syslogd.conf).
--LogFileName = "/var/drweb/log/drwebd.log"
-+LogFileName = "%INSTALL%/log/drwebd.log"
- ;LogFileName = "syslog"
- ;SyslogFacility = "Daemon"
- ;SyslogPriority = "Info"
-@@ -141,7 +141,7 @@
- ;OutputMode = { Terminal | Quiet }
- ;        Mode of output information on the console, Quiet cancels
- ;        output.
--OutputMode = Terminal
-+OutputMode = Quiet
- 
- ;--- User settings: ---
- 
-@@ -170,10 +170,11 @@
- ;        Example: Socket 3000 127.0.0.1, 192.168.0.100
- ;        The second form describes unix-socket, {file} - socket name,
- ;        {access} - octal value of access rights.
--;        Example: Socket /var/run/drwebd.socket 666 
-+;        Example: Socket /var/run/drwebd.socket 666
- ;        Number of socket keys is not limited, daemon will work with all
- ;        correctly described sockets.
--Socket = 3000 127.0.0.1
-+;Socket 3000 127.0.0.1
-+Socket = %INSTALL%/run/drwebd.sock 660
- 
- ;ListeningQueue = "value"
- ;        Defines sockets queue maximum size. Value may vary from 0 to
-@@ -187,7 +188,7 @@
+-Key = "/usr/local/drweb/drweb32.key"
++Key = "%INSTALL%/drweb32.key"
+ 
+ ;MailAddressesList = {path to the file}
+ ;        This file is used only if you have bought e-mail license for
+@@ -50,7 +50,7 @@
+ ;        Location of file with list of licensed email addresses.
+ ;        Format of file: one address per line. Address can be in local
+ ;        or local@fqdn form. See default email.ini for examples.
+-MailAddressesList = "/usr/local/etc/drweb/email.ini"
++MailAddressesList = "%INSTALL%/email.ini"
+ 
+ ;TrafficEqualPerHour = { Yes | No }
+ ;        This parameter is used only if you have bought traffic license.
+@@ -108,7 +108,7 @@
  ;        Default value:
  ;               "/var/run/drwebd.pid" (Attention!!! Only the programs executed
  ;               with the root rights have write access to /var/run).
@@ -69,31 +59,41 @@
  
  ;BusyFile = { path to file }
  ;        Daemon's busy file name: it is created by the scanning "copy" of
-@@ -196,7 +197,7 @@
+@@ -117,7 +117,7 @@
  ;        every "copy" of the daemon gets expanded with a point and ASCIIZ
  ;        representation of PID (e.g., /var/run/drwebd.bsy.123456).
  ;        Default value: absent (file does not get created)
--;BusyFile = "/var/drweb/run/drwebd.bsy"
-+;BusyFile = "%INSTALL%/run/drwebd.bsy"
+-BusyFile = "/var/drweb/run/drwebd.bsy"
++BusyFile = "%INSTALL%/run/drwebd.bsy"
  
  ;MaxChildren = "value"
  ;        Sets maximum amount of simultaneously working child (scanning)
-@@ -252,12 +253,12 @@
- ;        MaxCompressionRatio switch). 
- ;CompressionCheckThreshold = 1024
- 
+@@ -220,13 +220,13 @@
+ ;MoveFilesTo = { path }
+ ;        Path to quarantine directory. 
+ ;        This feature is used only by Dr.Web VFS for Samba. 
 -MoveFilesTo = "/var/drweb/infected"
 +MoveFilesTo = "%INSTALL%/infected"
- RenameFilesTo = #??
  
- ;UpdatePath = path
- ;       This parameter is used by update script.
--UpdatePath = "/var/drweb/updates"
-+UpdatePath = "%INSTALL%/updates"
+ ;BackupFilesTo = { path }
+ ;        Path to directory is used for backup infected files
+ ;        if curing has been requested. No backup copies will
+ ;        be created if parameter was not been defined.
+-;BackupFilesTo = "/var/drweb/infected"
++;BackupFilesTo = "%INSTALL%/infected"
+ 
  
- ;--- Filter settings: ---
- ;
-@@ -318,23 +319,23 @@
+ ; ====================
+@@ -244,7 +244,7 @@
+ ;LogFileName = "syslog"
+ ;SyslogFacility = "Daemon"
+ ;SyslogPriority = "Info"
+-LogFileName = "/var/drweb/log/drwebd.log"
++LogFileName = "/var/log/drwebd.log"
+ 
+ ;LimitLog = { Yes | No }
+ ;        Enable/Disable limit for log file size. Parameter
+@@ -435,34 +435,34 @@
  ;        also used by the updating module to update the search module. You
  ;        may specify relational path, but it is strongly recommended to make
  ;        it absolute.
@@ -102,11 +102,24 @@
  
  ;VirusBase = { list of the paths (masks) to the files, usual extension is vdb }
  ;        Masks for the loaded virus bases. This parameter is also used by
- ;        the updating module to update antivirus' bases. A few masks can be
+ ;        the updating module to update antivirus bases. A few masks can be
  ;        enumerated.
 -VirusBase = "/var/drweb/bases/*.vdb", "/var/drweb/bases/*.VDB"
 +VirusBase = "%INSTALL%/bases/*.vdb", "%INSTALL%/bases/*.VDB"
  
+ ;UpdatePath = { path }
+ ;       This parameter is used by update script. This is a place for files
+ ;       (except drweb32.dll and bases) has been downloaded by update script.
+-UpdatePath = "/var/drweb/updates"
++UpdatePath = "%INSTALL%/updates"
+ 
+ ;TempPath = { path }
+ ;       This path is used by antivirus engine for creating temporary files. 
+ ;       /tmp would been used if TempPath is not defined. 
+ ;       Normally, the daemon attempts to avoid using of TempPath.
+-TempPath = "/var/drweb/spool"
++TempPath = "/tmp"
+ 
  ;LngFileName = { path to the language resource file, usual extension - dwl }
  ;        Localization file location.
 -;LngFileName = "/usr/local/drweb/lib/russian.dwl"
@@ -116,33 +129,17 @@
  ;        Location of the file with the registration key. You may specify
  ;        relational path, but it is strongly recommended to make it
  ;        absolute.
--Key = "/usr/local/drweb/drweb.key"
-+Key = "%INSTALL%/drweb.key"
- 
- ;FilesTypes = { extension list }
- ;        Types of files that will get checked if by type scanning is
-@@ -410,7 +411,7 @@
- ActionInfectedMail = Report
- ActionInfectedContainer = Report
+-Key = "/usr/local/drweb/drweb32.key"
++Key = "%INSTALL%/drweb32.key"
  
--MoveFilesTo = "/var/drweb/infected"
-+MoveFilesTo = "%INSTALL%/infected"
- RenameFilesTo = #??
- 
- ;LogFileName = { file name }
-@@ -421,7 +422,7 @@
- ;        of their importance, you can find out where the daemon's report will
- ;        be written to, basing on these two parameters and the contents of
- ;        the configuration file syslog (usually /etc/syslogd.conf).
+ ; ========================
+ ; =   Running settings   =
+@@ -614,7 +614,7 @@
+ ;LogFileName = "syslog"
+ ;SyslogFacility = "Daemon"
+ ;SyslogPriority = "Info"
 -LogFileName = "/var/drweb/log/drweb.log"
-+LogFileName = "%INSTALL%/log/drweb.log"
- 
- ;LogScanned = { Yes | No }
- ;        Should the information on all the checked objects independently
-@@ -467,5 +468,5 @@
- 
- ;UpdatePath = path
- ;       This parameter is used by update script.
--UpdatePath = /usr/local/drweb/updates
-+UpdatePath = %INSTALL%/updates
++LogFileName = "/var/log/drweb.log"
  
+ ;LimitLog = { Yes | No }
+ ;        Enable/Disable limit for log file size. Parameter
diff --git a/security/drweb/files/patch-ab b/security/drweb/files/patch-ab
index 0f9e45ec69f8..198e6f4f3b1c 100644
--- a/security/drweb/files/patch-ab
+++ b/security/drweb/files/patch-ab
@@ -1,20 +1,20 @@
---- usr/local/drweb/update/update.pl.orig	Sat Nov  1 07:59:33 2003
-+++ usr/local/drweb/update/update.pl	Sat Nov  1 08:00:54 2003
-@@ -41,7 +41,7 @@
+--- usr/local/drweb/update/update.pl.orig	Wed Nov 24 13:39:08 2004
++++ usr/local/drweb/update/update.pl	Wed Nov 24 13:39:36 2004
+@@ -20,7 +20,7 @@
  my $ini = $ARGV[0];
  if( $ini eq '' )
  {
--  $ini = '/usr/local/etc/drweb/drweb32.ini' if $^O =~ /BSD/i;  
-+  $ini = '%INSTALL%/drweb32.ini' if $^O =~ /BSD/i;  
-   $ini = '/etc/drweb/drweb32.ini' if $ini eq '';    
+-  $ini = '/usr/local/etc/drweb/drweb32.ini';  
++  $ini = '%INSTALL%/drweb32.ini';  
  }
  
-@@ -79,7 +79,7 @@
-    die "Bases path is not defined!" unless $bases;
-    die "Update path is not defined!" unless $update;
-    
--   $pidFile = "/var/drweb/run/drwebd.pid" if( $pidFile eq '' );
-+   $pidFile = "%INSTALL%/drwebd.pid" if( $pidFile eq '' );
+ my $wget = `which wget 2>&1`;
+@@ -47,7 +47,7 @@
+ die 'Bases path is not defined!' unless $bases;
+ die 'Update path is not defined!' unless $update;
  
- my $version = readVersion( $engine ); 
-    die "Engine version error (invalid engine?)" unless $version;
+-$pidFile = '/var/drweb/run/drwebd.pid' if $pidFile eq '';
++$pidFile = '%INSTALL%/run/drwebd.pid' if $pidFile eq '';
+ 
+ my ( $kmd5, $knum ) = parseKey($keyFile);
+ $wget = $wget.' -q --header="X-DrWeb-Validate: '.$kmd5.'" --header="X-DrWeb-KeyNumber: '.$knum.'" -O';
diff --git a/security/drweb/files/patch-ac b/security/drweb/files/patch-ac
index 16940bb32983..a03fd6c5c98c 100644
--- a/security/drweb/files/patch-ac
+++ b/security/drweb/files/patch-ac
@@ -1,6 +1,6 @@
---- usr/local/etc/rc.d/00drwebd.sh.orig	Sat Nov  1 08:03:03 2003
-+++ usr/local/etc/rc.d/00drwebd.sh	Sat Nov  1 08:06:38 2003
-@@ -3,20 +3,20 @@
+--- usr/local/etc/rc.d/00.drwebd.sh.orig	Wed Nov 24 13:50:18 2004
++++ usr/local/etc/rc.d/00.drwebd.sh	Wed Nov 24 13:51:57 2004
+@@ -7,21 +7,21 @@
  case "$1" in
      stop)
  	echo -n "Shutting down Dr. Web daemon..."
@@ -20,9 +20,10 @@
 -	/usr/local/drweb/drwebd
 +	%INSTALL%/drwebd -ini=%INSTALL%/drweb32.ini
      ;;
-     *)
+     start)
  	echo -n "Starting Dr. Web daemon..."
 -	/usr/local/drweb/drwebd
 +	%INSTALL%/drwebd -ini=%INSTALL%/drweb32.ini
- esac
- 
+     ;;
+     *)
+     echo $0: 'start|stop|restart|reload'