8 files changed, 160 insertions, 183 deletions

diff --git a/security/drweb/Makefile b/security/drweb/Makefile
index b7bdc2930b13..663b5d147b0f 100644
--- a/security/drweb/Makefile
+++ b/security/drweb/Makefile
@@ -6,46 +6,47 @@
 #
 
 PORTNAME=	drweb
-PORTVERSION=    4.27
+PORTVERSION=    4.28
 CATEGORIES=	security
-MASTER_SITES=   http://www.drweb.ru/ftp/web_pub/ \
-		http://www.drweb.ru/ftp/update_free/freebsd4/
-DISTFILES=      ${MAIN_NAME}.tgz \
-		drwebd_4.27_freebsd4_update.tgz
-EXTRACT_ONLY=   ${MAIN_NAME}.tgz
+MASTER_SITES=   http://drweb.spb.ru/download/unix/
+DISTFILES=      ${MAIN_NAME}.tgz
 
 MAINTAINER=	anton@urc.ac.ru
 
-NO_BUILD=	YES
+NO_BUILD=       yes
 
 WRKSRC=         ${WRKDIR}/${MAIN_NAME}
 
 # Needed for update.pl
 RUN_DEPENDS=    ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/String/CRC32.pm:${PORTSDIR}/devel/p5-String-CRC32
 
-MAIN_NAME=      ${PORTNAME}d-${PORTVERSION}-freebsd4
+MAIN_NAME=      ${PORTNAME}-${PORTVERSION}-freebsd4
 DRWEB_PREFIX=	${PREFIX}/${PORTNAME}
 
 do-install:
 	-@install -dv -o ${BINOWN} -g ${BINGRP} ${DRWEB_PREFIX}
-	@cd ${DRWEB_PREFIX}; ${RM} -f drw*.txt drw*.vdb drweb drwebd
-	${TAR} -xzf ${WRKSRC}/${MAIN_NAME}.tar.gz -C ${DRWEB_PREFIX} \
-		--exclude *.ini --exclude *.key
-	${TAR} -xzf ${DISTDIR}/drwebd_4.27_freebsd4_update.tgz -C ${DRWEB_PREFIX} \
-		--exclude README
-	${TAR} -xzOf ${WRKSRC}/${MAIN_NAME}.tar.gz drweb32.ini \
-		> ${DRWEB_PREFIX}/drweb32.ini-tmpl
-	${TAR} -xzOf ${WRKSRC}/${MAIN_NAME}.tar.gz drweb.key \
-		> ${DRWEB_PREFIX}/drweb.key-dist
-	${TAR} -xzOf ${WRKSRC}/${MAIN_NAME}.tar.gz drwebd.key \
-		> ${DRWEB_PREFIX}/drwebd.key-dist
-	cd ${DRWEB_PREFIX}; \
-		${PATCH} -s < ${FILESDIR}/ini-patch && \
-		${RM} drweb32.ini-tmpl.orig
-	cd ${DRWEB_PREFIX}; \
-		${SED} 's#__INSTALL_DIR__#${DRWEB_PREFIX}#' \
-		< drweb32.ini-tmpl > drweb32.ini-dist && \
-		${RM} drweb32.ini-tmpl
+	@cd ${DRWEB_PREFIX}; ${RM} -f drweb drwebd bases/* updates/*
+	${TAR} -cf - -C ${WRKSRC}/opt/drweb . | \
+		${TAR} -xf - -C ${DRWEB_PREFIX} \
+		--exclude "*.key" --exclude "update/update.pl*"
+	${TAR} -cf - -C ${WRKSRC}/var/drweb bases | \
+		${TAR} -xf - -C ${DRWEB_PREFIX}
+	${INSTALL_DATA} ${WRKSRC}/opt/drweb/drweb.key \
+		${DRWEB_PREFIX}/drweb.key-dist
+	${INSTALL_DATA} ${WRKSRC}/opt/drweb/drwebd.key \
+		${DRWEB_PREFIX}/drwebd.key-dist
+	${SED} 's#%INSTALL%#${DRWEB_PREFIX}#g' \
+		< ${WRKSRC}/opt/drweb/update/update.pl \
+		> ${DRWEB_PREFIX}/update/update.pl
+	chmod 750 ${DRWEB_PREFIX}/update/update.pl
+	${SED} 's#%INSTALL%#${DRWEB_PREFIX}#g' \
+		< ${WRKSRC}/etc/drweb/drweb32.ini \
+		> ${DRWEB_PREFIX}/drweb32.ini-dist
+	${RM} -f ${PREFIX}/bin/drweb
+	${SED} 's#%INSTALL%#${DRWEB_PREFIX}#g' \
+		< ${FILESDIR}/drweb.sh \
+		> ${PREFIX}/bin/drweb
+	chmod 755 ${PREFIX}/bin/drweb
 	if [ ! -f ${DRWEB_PREFIX}/drweb32.ini ] ; then \
 		${CP} ${DRWEB_PREFIX}/drweb32.ini-dist \
 		      ${DRWEB_PREFIX}/drweb32.ini; \
diff --git a/security/drweb/distinfo b/security/drweb/distinfo
index 182a186167dc..55e0462ddc5f 100644
--- a/security/drweb/distinfo
+++ b/security/drweb/distinfo
@@ -1,2 +1 @@
-MD5 (drwebd-4.27-freebsd4.tgz) = 1ea2c05c821bef64c3d050e971ad46e5
-MD5 (drwebd_4.27_freebsd4_update.tgz) = 398d0d32e9d7a096aa3db452e846ef9a
+MD5 (drweb-4.28-freebsd4.tgz) = 18c8447a337359c99dfcfe84bd7c92a0
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;
diff --git a/security/drweb/pkg-install b/security/drweb/pkg-install
index 7b562be695b1..7a6bf9888aba 100644
--- a/security/drweb/pkg-install
+++ b/security/drweb/pkg-install
@@ -49,4 +49,5 @@ fi
 [ "$ex" = "1" ] && exit 1
 install -dv -m 0755 -o ${USER} -g ${BINGRP} ${PKG_PREFIX}/drweb/run
 install -dv -m 0700 -o ${USER} -g ${BINGRP} ${PKG_PREFIX}/drweb/infected
+install -dv -m 0700 -o ${BINOWN} -g ${BINGRP} ${PKG_PREFIX}/drweb/updates
 exit 0
diff --git a/security/drweb/pkg-plist b/security/drweb/pkg-plist
index bd33d113caf6..fbfa3f063b6d 100644
--- a/security/drweb/pkg-plist
+++ b/security/drweb/pkg-plist
@@ -1,9 +1,9 @@
+@comment $FreeBSD$
+bin/drweb
 drweb/CHANGES
 drweb/README
 drweb/README.RUS
-drweb/clients/cgp/README
-drweb/clients/cgp/readme.cgp
-drweb/clients/cgp/readme.cgp.rus
+drweb/bases/drwebase.vdb
 drweb/clients/demo/drwebdc-demo.c
 drweb/clients/demo/drwebdc-demo.h
 drweb/clients/demo/drwebdc-ex1.c
@@ -11,119 +11,37 @@ drweb/clients/demo/drwebdc-ex2.c
 drweb/clients/demo/drwebdc-ex3.c
 drweb/clients/demo/drwebdc-tools.c
 drweb/clients/demo/make-all.sh
-drweb/clients/drwebdc/ChangeLog
-drweb/clients/drwebdc/Makefile.aix
-drweb/clients/drwebdc/Makefile.bsd
-drweb/clients/drwebdc/Makefile.gnu
-drweb/clients/drwebdc/Makefile.os2
-drweb/clients/drwebdc/Makefile.win
-drweb/clients/drwebdc/README
-drweb/clients/drwebdc/configure
-drweb/clients/drwebdc/drweb_cgp.c
-drweb/clients/drwebdc/drwebdc.c
-drweb/clients/drwebdc/dw_filter.c
-drweb/clients/drwebdc/dw_filter.h
-drweb/clients/drwebdc/dwf_main.c
-drweb/clients/drwebdc/src/Makefile.aix
-drweb/clients/drwebdc/src/Makefile.bsd
-drweb/clients/drwebdc/src/Makefile.gnu
-drweb/clients/drwebdc/src/Makefile.os2
-drweb/clients/drwebdc/src/Makefile.win
-drweb/clients/drwebdc/src/bsd_queue.h
-drweb/clients/drwebdc/src/dwc_err.c
-drweb/clients/drwebdc/src/dwc_err.h
-drweb/clients/drwebdc/src/dwc_event.c
-drweb/clients/drwebdc/src/dwc_event.h
-drweb/clients/drwebdc/src/dwc_ipc.c
-drweb/clients/drwebdc/src/dwc_ipc.h
-drweb/clients/drwebdc/src/dwc_lib.c
-drweb/clients/drwebdc/src/dwc_lib.h
-drweb/clients/drwebdc/src/dwc_log.c
-drweb/clients/drwebdc/src/dwc_log.h
-drweb/clients/drwebdc/src/dwc_macro.h
-drweb/clients/drwebdc/src/dwc_mutex.c
-drweb/clients/drwebdc/src/dwc_mutex.h
-drweb/clients/drwebdc/src/dwc_scan.h
-drweb/clients/drwebdc/src/dwc_tcp.c
-drweb/clients/drwebdc/src/dwc_tcp.h
-drweb/clients/drwebdc/src/dwc_thread.c
-drweb/clients/drwebdc/src/dwc_thread.h
-drweb/clients/drwebdc/src/dwc_timo.c
-drweb/clients/drwebdc/src/dwc_timo.h
-drweb/clients/drwebdc/src/dwc_type.h
-drweb/clients/drwebdc/src/dwc_unix.c
-drweb/clients/drwebdc/src/dwc_unix.h
-drweb/clients/drwebdc/syslog/include/sys/syslog.h
-drweb/clients/drwebdc/syslog/include/syslog.h
-drweb/clients/drwebdc/syslog/lib/syslog.a
-drweb/clients/drwebdc/win_build.bat
-drweb/clients/drwebdc/win_clean.bat
-drweb/clients/exim/drweb_exim.pl
-drweb/clients/exim/drweb_exim.sh
-drweb/clients/exim/readme.exim
-drweb/clients/exim/readme.exim.rus
-drweb/clients/postfix/drweb_postfix.pl
-drweb/clients/postfix/drweb_postfix.sh
-drweb/clients/postfix/readme.postfix
-drweb/clients/postfix/readme.postfix.rus
-drweb/clients/qmail/drweb_qmail.pl
-drweb/clients/qmail/qmail-scanner-0.9x.patch
-drweb/clients/qmail/qmail-scanner-1.0x.patch
-drweb/clients/qmail/readme.qmail
-drweb/clients/qmail/readme.qmail.rus
-drweb/clients/qmail/sub-drweb.0.9x.pl
-drweb/clients/qmail/sub-drweb.1.0x.pl
-drweb/clients/sendmail/README
-drweb/clients/sendmail/configure
-drweb/clients/sendmail/example-rus.sh
-drweb/clients/sendmail/example.sh
-drweb/clients/sendmail/listener-8.11.1.patch
-drweb/clients/sendmail/listener-8.12.0.patch
-drweb/clients/sendmail/readme.sendmail
-drweb/clients/sendmail/readme.sendmail.rus
-drweb/clients/sendmail/template.cf.addon
-drweb/clients/sendmail/template.initscript
-drweb/clients/sendmail/template.mc.addon
-drweb/doc/drweb-ini
-drweb/doc/drweb-ini.rus
-drweb/doc/drwebd-api
-drweb/doc/drwebd-api.rus
-drweb/doc/history.txt
+drweb/clients/drwebd-api
+drweb/doc/readme.daemon
+drweb/doc/readme.daemon.rus
 drweb/doc/readme.eicar
+drweb/doc/readme.scanner
+drweb/doc/readme.scanner.rus
 drweb/drweb
 @unexec if [ -f %D/drweb/drweb.key ] && cmp -s %D/drweb/drweb.key %D/drweb/drweb.key-dist; then rm -f %D/drweb/drweb.key; fi
 drweb/drweb.key-dist
 @exec if [ ! -f %D/drweb/drweb.key ] ; then cp -p %D/%F %B/drweb.key; fi
-drweb/drweb32.dll
 @unexec if [ -f %D/drweb/drweb32.ini ] && cmp -s %D/drweb/drweb32.ini %D/drweb/drweb32.ini-dist; then rm -f %D/drweb/drweb32.ini; fi
 drweb/drweb32.ini-dist
 @exec if [ ! -f %D/drweb/drweb32.ini ] ; then cp -p %D/%F %B/drweb32.ini; fi
-drweb/drwebase.vdb
 drweb/drwebd
 @unexec if [ -f %D/drweb/drwebd.key ] && cmp -s %D/drweb/drwebd.key %D/drweb/drwebd.key-dist; then rm -f %D/drweb/drwebd.key; fi
 drweb/drwebd.key-dist
 @exec if [ ! -f %D/drweb/drwebd.key ] ; then cp -p %D/%F %B/drwebd.key; fi
-drweb/russian.dwl
+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
-@dirrm drweb/clients/cgp
+@dirrm drweb/bases
 @dirrm drweb/clients/demo
-@dirrm drweb/clients/drwebdc/include
-@dirrm drweb/clients/drwebdc/lib
-@dirrm drweb/clients/drwebdc/src
-@dirrm drweb/clients/drwebdc/syslog/include/sys
-@dirrm drweb/clients/drwebdc/syslog/include
-@dirrm drweb/clients/drwebdc/syslog/lib
-@dirrm drweb/clients/drwebdc/syslog
-@dirrm drweb/clients/drwebdc
-@dirrm drweb/clients/exim
-@dirrm drweb/clients/postfix
-@dirrm drweb/clients/qmail
-@dirrm drweb/clients/sendmail
 @dirrm drweb/clients
 @dirrm drweb/doc
 @dirrm drweb/infected
+@dirrm drweb/lib
 @dirrm drweb/run
 @dirrm drweb/update
+@dirrm drweb/updates
 @dirrm drweb