4 files changed, 14 insertions, 55 deletions

diff --git a/security/drweb/Makefile b/security/drweb/Makefile
index 614499e34334..18b58b16dc26 100644
--- a/security/drweb/Makefile
+++ b/security/drweb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	drweb
 PORTVERSION=    4.28.1
+PORTREVISION=   1
 CATEGORIES=	security
 MASTER_SITES=   http://drweb.spb.ru/download/unix/
 DISTFILES=      ${MAIN_NAME}.tgz
diff --git a/security/drweb/distinfo b/security/drweb/distinfo
index 1f7d499ae807..aaadccc05c7b 100644
--- a/security/drweb/distinfo
+++ b/security/drweb/distinfo
@@ -1 +1 @@
-MD5 (drweb-4.28.1-freebsd4.tgz) = fb43d9351a82162694c173b8b5c194c6
+MD5 (drweb-4.28.1-freebsd4.tgz) = 7e7be4de3167a8e3c150331f4d95f841
diff --git a/security/drweb/files/patch-aa b/security/drweb/files/patch-aa
index 5df461be2057..5d9c14dfd03c 100644
--- a/security/drweb/files/patch-aa
+++ b/security/drweb/files/patch-aa
@@ -1,5 +1,5 @@
---- etc/drweb/drweb32.ini.orig	Wed May 15 04:09:24 2002
-+++ etc/drweb/drweb32.ini	Fri May 17 12:34:29 2002
+--- etc/drweb/drweb32.ini.orig	Sat May 18 14:28:51 2002
++++ etc/drweb/drweb32.ini	Tue May 21 19:10:43 2002
 @@ -1,11 +1,11 @@
  [BSD]
 -EnginePath = "/opt/drweb/lib/drweb32.dll"
@@ -18,7 +18,7 @@
  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 @@
+@@ -30,40 +30,40 @@
  ScanSubDirectories = Yes
  PromptOnAction = No
  LimitLog = No
@@ -48,20 +48,21 @@
 -;BusyFile = "/var/drweb/run/drwebd.bsy"
 -SocketMode = TCP
 -SocketFile = "/var/drweb/run/drwebd.socket"
+-;PidFile = "/var/drweb/run/drwebd.pid"
 -;SocketMode = Unix
 -;SocketAccess 0666
-+PidFile = "%INSTALL%/run/drwebd.pid"
++;LogFileName = "/var/log/drwebd.log"
 +;BusyFile = "%INSTALL%/run/drwebd.bsy"
 +;SocketMode = TCP
 +SocketFile = "%INSTALL%/run/drwebd.sock"
++PidFile = "%INSTALL%/run/drwebd.pid"
 +SocketMode = Unix
 +SocketAccess 0660
  DaemonPort = 3000
  SocketTimeout = 40
  SocketReuseAddr = Yes
--FileTimeout = 5
+ FileTimeout = 40
 -OutputMode = Terminal
-+FileTimeout = 20
 +OutputMode = Quiet
  LimitLog = No
 -MaxLogSize = 512
@@ -75,7 +76,7 @@
  ;UserID = 
  ;GroupID = 
  ScanFiles = All
-@@ -72,8 +72,8 @@
+@@ -73,7 +73,7 @@
  SyslogPriority = "Alert"
  
  FilterRule X-Mailer ".*Mass.*Sender.*" Reject
@@ -85,6 +86,4 @@
 +;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
index ed61de1d3351..62ae2fd30a0e 100644
--- a/security/drweb/files/patch-ab
+++ b/security/drweb/files/patch-ab
@@ -1,6 +1,6 @@
---- 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 @@
+--- opt/drweb/update/update.pl.orig	Sat May 18 04:56:03 2002
++++ opt/drweb/update/update.pl	Tue May 21 19:03:37 2002
+@@ -35,7 +35,7 @@
  my $ini = $ARGV[0];
  if( $ini eq '' )
  {
@@ -8,11 +8,7 @@
 +  $ini = "%INSTALL%/drweb32.ini";
  }
  
--my $fetch = "fetch -aq -o";
-+my $fetch = "fetch -q -o";
- #my $fetch = "wget -q -O";
-    $fetch = "wget -q -O" if( $^O =~ /Linux/i );   
- 
+ my $fetch = "fetch -q -o";
 @@ -52,7 +52,7 @@
     die "Bases path is not defined!" unless $bases;
     die "Update path is not defined!" unless $update;
@@ -22,40 +18,3 @@
  
  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;
-       }
-     }
-   }