4 files changed, 18 insertions, 13 deletions

diff --git a/security/drweb/Makefile b/security/drweb/Makefile
index a09deb13b54f..4a4856cc297c 100644
--- a/security/drweb/Makefile
+++ b/security/drweb/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	drweb
-PORTVERSION=    4.28.1
-PORTREVISION=   1
+PORTVERSION=    4.28.2
 CATEGORIES=	security
 MASTER_SITES=   http://drweb.spb.ru/download/unix/
 DISTFILES=      ${MAIN_NAME}.tgz
@@ -16,7 +15,7 @@ MAINTAINER=	anton@chelcom.ru
 
 NO_BUILD=       yes
 
-WRKSRC=         ${WRKDIR}/${MAIN_NAME}
+WRKSRC=         ${WRKDIR}/${MAIN_NAME}/install
 
 # Needed for update.pl
 RUN_DEPENDS=    ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/String/CRC32.pm:${PORTSDIR}/devel/p5-String-CRC32
@@ -32,6 +31,7 @@ do-install:
 		--exclude "*.key" --exclude "update/update.pl*"
 	${TAR} -cf - -C ${WRKSRC}/var/drweb bases | \
 		${TAR} -xf - -C ${DRWEB_PREFIX}
+	chmod 755 ${DRWEB_PREFIX}/bases
 	${INSTALL_DATA} ${WRKSRC}/opt/drweb/drweb.key \
 		${DRWEB_PREFIX}/drweb.key-dist
 	${INSTALL_DATA} ${WRKSRC}/opt/drweb/drwebd.key \
diff --git a/security/drweb/distinfo b/security/drweb/distinfo
index aaadccc05c7b..4937ccf707d1 100644
--- a/security/drweb/distinfo
+++ b/security/drweb/distinfo
@@ -1 +1 @@
-MD5 (drweb-4.28.1-freebsd4.tgz) = 7e7be4de3167a8e3c150331f4d95f841
+MD5 (drweb-4.28.2-freebsd4.tgz) = 27dcbd609e9f3087e386bf72268ef512
diff --git a/security/drweb/files/patch-aa b/security/drweb/files/patch-aa
index 5d9c14dfd03c..ef413ff1d3fa 100644
--- a/security/drweb/files/patch-aa
+++ b/security/drweb/files/patch-aa
@@ -1,5 +1,5 @@
---- etc/drweb/drweb32.ini.orig	Sat May 18 14:28:51 2002
-+++ etc/drweb/drweb32.ini	Tue May 21 19:10:43 2002
+--- etc/drweb/drweb32.ini.orig	Thu Aug 22 19:09:19 2002
++++ etc/drweb/drweb32.ini	Fri Aug 23 23:42:50 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,40 +30,40 @@
+@@ -30,44 +30,44 @@
  ScanSubDirectories = Yes
  PromptOnAction = No
  LimitLog = No
@@ -30,6 +30,10 @@
 -UpdatePath = "/opt/drweb/updates"
 +UpdatePath = "%INSTALL%/updates"
  
+ RecodeNonprintable = Yes
+ RecodeMode = QuotedPrintable
+ RecodeChar = "?"
+ 
  [BSD:Daemon]
 -EnginePath = "/opt/drweb/lib/drweb32.dll"
 -VirusBase = "/var/drweb/bases/*.vdb", "/var/drweb/bases/*.VDB"
@@ -40,7 +44,7 @@
 +MoveFilesTo = "%INSTALL%/infected"
 +;LngFileName = "%INSTALL%/lib/russian.dwl"
  
--Key = "/opt/drweb/drweb.key"
+-Key = "/opt/drweb/drwebd.key"
 +Key = "%INSTALL%/drwebd.key"
  LogTime = Yes
  LogFileName = "syslog"
@@ -48,16 +52,16 @@
 -;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 = "/var/drweb/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
++PidFile = "%INSTALL%/run/drwebd.pid"
  DaemonPort = 3000
  SocketTimeout = 40
  SocketReuseAddr = Yes
@@ -76,7 +80,7 @@
  ;UserID = 
  ;GroupID = 
  ScanFiles = All
-@@ -73,7 +73,7 @@
+@@ -77,10 +77,10 @@
  SyslogPriority = "Alert"
  
  FilterRule X-Mailer ".*Mass.*Sender.*" Reject
@@ -87,3 +91,6 @@
  
 -UpdatePath = "/opt/drweb/updates"
 +UpdatePath = "%INSTALL%/updates"
+ 
+ RecodeNonprintable = Yes
+ RecodeMode = QuotedPrintable
diff --git a/security/drweb/pkg-plist b/security/drweb/pkg-plist
index fbfa3f063b6d..9c3c408b3d99 100644
--- a/security/drweb/pkg-plist
+++ b/security/drweb/pkg-plist
@@ -29,9 +29,7 @@ drweb/drwebd
 drweb/drwebd.key-dist
 @exec if [ ! -f %D/drweb/drwebd.key ] ; then cp -p %D/%F %B/drwebd.key; fi
 drweb/lib/drweb32.dll
-drweb/lib/german.dwl
 drweb/lib/russian.dwl
-drweb/lib/spanish.dwl
 drweb/update/readme.update
 drweb/update/readme.update.rus
 drweb/update/update.pl