Upgrade to 4.28

4 files changed, 116 insertions, 58 deletions

diff --git a/security/drweb/files/drweb.sh b/security/drweb/files/drweb.sh
new file mode 100644
index 000000000000..a4c863ead7e5
--- /dev/null
+++ b/security/drweb/files/drweb.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec %INSTALL%/drweb -ini:%INSTALL%/drweb32.ini $*
diff --git a/security/drweb/files/ini-patch b/security/drweb/files/ini-patch
deleted file mode 100644
index 1a2a0335098c..000000000000
--- a/security/drweb/files/ini-patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- drweb32.ini-tmpl.orig	Fri Jan  4 09:31:39 2002
-+++ drweb32.ini-tmpl	Fri Jan  4 09:32:40 2002
-@@ -5,7 +5,7 @@
- 
- [BSD]
- Key = "__INSTALL_DIR__/drweb.key"
--LogFileName = "/var/log/drweb.log"
-+LogFileName = "/dev/null"
- RenameFilesTo = #??
- FilesTypes = EXE,COM,SYS,OV?,BAT,BIN,DRV,PRG,BOO,SCR,CMD,VXD,386,DLL,FON,DO?
- FilesTypes = XL?,WIZ,RTF,CL*,HT*,VB*,JS*,INF,AR?,ZIP,R??,PP?,OBJ,LIB,HLP,MD?
-@@ -30,7 +30,7 @@
- ScanSubDirectories = Yes
- PromptOnAction = No
- LimitLog = No
--MaxLogSize = 512
-+;MaxLogSize = 512
- OutputMode = Terminal
- FollowLinks = No
- 
-@@ -38,22 +38,24 @@
- Key = "__INSTALL_DIR__/drwebd.key"
- LogTime = Yes
- LogFileName = "syslog"
-+PidFile = "__INSTALL_DIR__/run/drwebd.pid"
- ;BusyFile = "/var/run/drwebd.bsy"
--SocketMode = TCP
--;SocketMode = Unix
--;SocketAccess 0666
-+;SocketMode = TCP
-+SocketMode = Unix
-+SocketFile = "__INSTALL_DIR__/run/drwebd.sock"
-+SocketAccess 0660
- DaemonPort = 3000
- SocketTimeout = 40
- SocketReuseAddr = Yes
- FileTimeout = 40
--OutputMode = Terminal
-+OutputMode = Quiet
- LimitLog = No
- MaxLogSize = 512
- LogScanned = Yes
- LogInfo = Yes
- LogPacked = Yes
- Interfaces = "localhost"
--;User = drweb
-+User = drweb
- ;UserID = 
- ;GroupID = 
- ScanFiles = All
-@@ -63,5 +65,5 @@
- SyslogPriority = "Alert"
- 
- FilterRule X-Mailer ".*Mass.*Sender.*" Reject
--FilterRule To ".*undisclosed.*recipient.*" Reject
--FilterRule Subject ".*free.*xxx.*" Reject
-+;FilterRule To ".*undisclosed.*recipient.*" Reject
-+;FilterRule Subject ".*free.*xxx.*" Reject
diff --git a/security/drweb/files/patch-aa b/security/drweb/files/patch-aa
new file mode 100644
index 000000000000..3ce50212c50f
--- /dev/null
+++ b/security/drweb/files/patch-aa
@@ -0,0 +1,89 @@
+--- etc/drweb/drweb32.ini.orig	Wed May  8 03:46:34 2002
++++ etc/drweb/drweb32.ini	Fri May 10 10:23:48 2002
+@@ -1,11 +1,11 @@
+ [BSD]
+-EnginePath = "/opt/drweb/lib/drweb32.dll"
+-VirusBase = "/var/drweb/bases/*.vdb"
+-MoveFilesTo = "/var/drweb/infected"
+-;LngFileName = "/opt/drweb/lib/russian.dwl"
++EnginePath = "%INSTALL%/lib/drweb32.dll"
++VirusBase = "%INSTALL%/bases/*.vdb"
++MoveFilesTo = "%INSTALL%/infected"
++;LngFileName = "%INSTALL%/lib/russian.dwl"
+ 
+-Key = "/opt/drweb/drweb.key"
+-LogFileName = "/var/drweb/log/drweb.log"
++Key = "%INSTALL%/drweb.key"
++LogFileName = "/dev/null"
+ RenameFilesTo = #??
+ FilesTypes = EXE,COM,SYS,OV?,BAT,BIN,DRV,PRG,BOO,SCR,CMD,VXD,386,DLL,FON,DO?
+ FilesTypes = XL?,WIZ,RTF,CL*,HT*,VB*,JS*,INF,AR?,ZIP,R??,PP?,OBJ,LIB,HLP,MD?
+@@ -30,39 +30,39 @@
+ ScanSubDirectories = Yes
+ PromptOnAction = No
+ LimitLog = No
+-MaxLogSize = 512
++;MaxLogSize = 512
+ OutputMode = Terminal
+ FollowLinks = No
+ 
+-UpdatePath = "/opt/drweb/updates"
++UpdatePath = "%INSTALL%/updates"
+ 
+ [BSD:Daemon]
+-EnginePath = "/opt/drweb/lib/drweb32.dll"
+-VirusBase = "/var/drweb/bases/*.vdb"
+-MoveFilesTo = "/var/drweb/infected"
+-;LngFileName = "/opt/drweb/lib/russian.dwl"
++EnginePath = "%INSTALL%/lib/drweb32.dll"
++VirusBase = "%INSTALL%/bases/*.vdb"
++MoveFilesTo = "%INSTALL%/infected"
++;LngFileName = "%INSTALL%/lib/russian.dwl"
+ 
+-Key = "/opt/drweb/drweb32.key"
++Key = "%INSTALL%/drwebd.key"
+ LogTime = Yes
+ LogFileName = "syslog"
+-;LogFileName = "/var/drweb/log/drwebd.log"
+-;BusyFile = "/var/drweb/run/drwebd.bsy"
+-SocketMode = TCP
+-SocketFile = "/var/drweb/run/drwebd.socket"
+-;SocketMode = Unix
+-;SocketAccess 0666
++PidFile = "%INSTALL%/run/drwebd.pid"
++;BusyFile = "%INSTALL%/run/drwebd.bsy"
++;SocketMode = TCP
++SocketFile = "%INSTALL%/run/drwebd.sock"
++SocketMode = Unix
++SocketAccess 0660
+ DaemonPort = 3000
+ SocketTimeout = 40
+ SocketReuseAddr = Yes
+ FileTimeout = 5
+-OutputMode = Terminal
++OutputMode = Quiet
+ LimitLog = No
+-MaxLogSize = 512
++;MaxLogSize = 512
+ LogScanned = Yes
+ LogInfo = Yes
+ LogPacked = Yes
+ Interfaces = "localhost"
+-;User = drweb
++User = drweb
+ ;UserID = 
+ ;GroupID = 
+ ScanFiles = All
+@@ -72,8 +72,8 @@
+ SyslogPriority = "Alert"
+ 
+ FilterRule X-Mailer ".*Mass.*Sender.*" Reject
+-FilterRule To ".*undisclosed.*recipient.*" Reject
+-FilterRule Subject ".*free.*xxx.*" Reject
++;FilterRule To ".*undisclosed.*recipient.*" Reject
++;FilterRule Subject ".*free.*xxx.*" Reject
+ 
+-UpdatePath = "/opt/drweb/updates"
+-InfectedFiles = Cure
++UpdatePath = "%INSTALL%/updates"
++;InfectedFiles = Cure
diff --git a/security/drweb/files/patch-ab b/security/drweb/files/patch-ab
new file mode 100644
index 000000000000..9112cf5a1396
--- /dev/null
+++ b/security/drweb/files/patch-ab
@@ -0,0 +1,24 @@
+--- 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 @@
+ my $ini = $ARGV[0];
+ if( $ini eq '' )
+ {
+-  $ini = "/etc/drweb/drweb32.ini";
++  $ini = "%INSTALL%/drweb32.ini";
+ }
+ 
+-my $fetch = "wget -q -O";
++my $fetch = "fetch -q -o";
+ 
+ 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;
+    
+-   $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;