Upgrade to 4.28.1

2 files changed, 54 insertions, 17 deletions

diff --git a/security/drweb/files/patch-aa b/security/drweb/files/patch-aa
index c40169b94b75..5df461be2057 100644
--- a/security/drweb/files/patch-aa
+++ b/security/drweb/files/patch-aa
@@ -1,13 +1,13 @@
---- etc/drweb/drweb32.ini.orig	Sat May 11 16:44:26 2002
-+++ etc/drweb/drweb32.ini	Mon May 13 18:46:14 2002
+--- etc/drweb/drweb32.ini.orig	Wed May 15 04:09:24 2002
++++ etc/drweb/drweb32.ini	Fri May 17 12:34:29 2002
 @@ -1,11 +1,11 @@
  [BSD]
 -EnginePath = "/opt/drweb/lib/drweb32.dll"
--VirusBase = "/var/drweb/bases/*.vdb"
+-VirusBase = "/var/drweb/bases/*.vdb", "/var/drweb/bases/*.VDB"
 -MoveFilesTo = "/var/drweb/infected"
 -;LngFileName = "/opt/drweb/lib/russian.dwl"
 +EnginePath = "%INSTALL%/lib/drweb32.dll"
-+VirusBase = "%INSTALL%/bases/*.vdb"
++VirusBase = "%INSTALL%/bases/*.vdb", "%INSTALL%/bases/*.VDB"
 +MoveFilesTo = "%INSTALL%/infected"
 +;LngFileName = "%INSTALL%/lib/russian.dwl"
  
@@ -32,15 +32,15 @@
  
  [BSD:Daemon]
 -EnginePath = "/opt/drweb/lib/drweb32.dll"
--VirusBase = "/var/drweb/bases/*.vdb"
+-VirusBase = "/var/drweb/bases/*.vdb", "/var/drweb/bases/*.VDB"
 -MoveFilesTo = "/var/drweb/infected"
 -;LngFileName = "/opt/drweb/lib/russian.dwl"
 +EnginePath = "%INSTALL%/lib/drweb32.dll"
-+VirusBase = "%INSTALL%/bases/*.vdb"
++VirusBase = "%INSTALL%/bases/*.vdb", "%INSTALL%/bases/*.VDB"
 +MoveFilesTo = "%INSTALL%/infected"
 +;LngFileName = "%INSTALL%/lib/russian.dwl"
  
--Key = "/opt/drweb/drwebd.key"
+-Key = "/opt/drweb/drweb.key"
 +Key = "%INSTALL%/drwebd.key"
  LogTime = Yes
  LogFileName = "syslog"
@@ -61,7 +61,7 @@
  SocketReuseAddr = Yes
 -FileTimeout = 5
 -OutputMode = Terminal
-+FileTimeout = 10
++FileTimeout = 20
 +OutputMode = Quiet
  LimitLog = No
 -MaxLogSize = 512
diff --git a/security/drweb/files/patch-ab b/security/drweb/files/patch-ab
index 9112cf5a1396..ed61de1d3351 100644
--- a/security/drweb/files/patch-ab
+++ b/security/drweb/files/patch-ab
@@ -1,6 +1,6 @@
---- opt/drweb/update/update.pl.bak	Wed May  8 07:56:59 2002
-+++ opt/drweb/update/update.pl	Fri May 10 08:54:26 2002
-@@ -33,10 +33,10 @@
+--- opt/drweb/update/update.pl.orig	Wed May 15 03:58:22 2002
++++ opt/drweb/update/update.pl	Fri May 17 13:07:42 2002
+@@ -35,10 +35,10 @@
  my $ini = $ARGV[0];
  if( $ini eq '' )
  {
@@ -8,17 +8,54 @@
 +  $ini = "%INSTALL%/drweb32.ini";
  }
  
--my $fetch = "wget -q -O";
+-my $fetch = "fetch -aq -o";
 +my $fetch = "fetch -q -o";
+ #my $fetch = "wget -q -O";
+    $fetch = "wget -q -O" if( $^O =~ /Linux/i );   
  
- my $engine = '';
- my $bases = '';
-@@ -48,7 +48,7 @@
-    die "Bases path is not defined (not in section?)" unless $bases;
-    die "Update path is not defined (not in section?)" unless $update;
+@@ -52,7 +52,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%/run/drwebd.pid" if( $pidFile eq '' );
  
  my $version = readVersion( $engine ); 
     die "Engine version error (invalid engine?)" unless $version;
+@@ -179,7 +179,7 @@
+       {
+         $engine = $v;
+         $engine =~ s/^[\"\t =]*//g;
+-        $engine =~ s/[\" \t]$*//g;       
++	$engine =~ s/[\" \t]*$//g;
+       }
+     }
+     elsif( /^PidFile/ )
+@@ -189,7 +189,7 @@
+       {
+         $pidFile= $v;
+         $pidFile =~ s/^[\"\t =]*//g;
+-        $pidFile =~ s/[\" \t]$*//g;       
++	$pidFile =~ s/[\" \t]*$//g;
+       }
+     }
+     elsif( /^VirusBase/ && $bases eq '' ) # first base path only
+@@ -200,7 +200,8 @@
+         $bases = $v;
+ 
+         $bases =~ s/^[\"\t =]*//g;
+-        $bases =~ s/[\" \t]$*//g;
++	$bases =~ s/,.*$//;
++	$bases =~ s/[\" \t]*$//g;
+ 	$bases =~ s/\/[\d\w\*\?\.]*$//;
+       }
+     }
+@@ -211,7 +212,7 @@
+       {
+         $update = $v;
+         $update =~ s/^[\"\t =]*//g;
+-        $update =~ s/[\" \t]$*//g;       
++	$update =~ s/[\" \t]*$//g;
+       }
+     }
+   }