6 files changed, 38 insertions, 39 deletions

diff --git a/security/drweb/Makefile b/security/drweb/Makefile
index 2c2550e36ee9..b7bdc2930b13 100644
--- a/security/drweb/Makefile
+++ b/security/drweb/Makefile
@@ -6,32 +6,38 @@
 #
 
 PORTNAME=	drweb
-PORTVERSION=    4.26c
-PORTREVISION=	2
+PORTVERSION=    4.27
 CATEGORIES=	security
-MASTER_SITES=	http://www.drweb.ru/ftp/web_pub/
-DISTNAME=	${PORTNAME}d-${PORTVERSION}-freebsd4
-EXTRACT_SUFX=	.tgz
+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
 
 MAINTAINER=	anton@urc.ac.ru
 
 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
 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}/${DISTNAME}.tar.gz -C ${DRWEB_PREFIX} \
+	${TAR} -xzf ${WRKSRC}/${MAIN_NAME}.tar.gz -C ${DRWEB_PREFIX} \
 		--exclude *.ini --exclude *.key
-	${TAR} -xzOf ${WRKSRC}/${DISTNAME}.tar.gz drweb32.ini \
+	${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}/${DISTNAME}.tar.gz drweb.key \
+	${TAR} -xzOf ${WRKSRC}/${MAIN_NAME}.tar.gz drweb.key \
 		> ${DRWEB_PREFIX}/drweb.key-dist
-	${TAR} -xzOf ${WRKSRC}/${DISTNAME}.tar.gz drwebd.key \
+	${TAR} -xzOf ${WRKSRC}/${MAIN_NAME}.tar.gz drwebd.key \
 		> ${DRWEB_PREFIX}/drwebd.key-dist
 	cd ${DRWEB_PREFIX}; \
 		${PATCH} -s < ${FILESDIR}/ini-patch && \
@@ -52,8 +58,6 @@ do-install:
 		${CP} ${DRWEB_PREFIX}/drwebd.key-dist \
 		      ${DRWEB_PREFIX}/drwebd.key; \
 	fi
-	cd ${DRWEB_PREFIX}/update; \
-		${PATCH} -s < ${FILESDIR}/update-patch && ${RM} update.pl.orig
 
 post-install:
 	PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} POST-INSTALL
diff --git a/security/drweb/distinfo b/security/drweb/distinfo
index 7efea82f2db4..182a186167dc 100644
--- a/security/drweb/distinfo
+++ b/security/drweb/distinfo
@@ -1 +1,2 @@
-MD5 (drwebd-4.26c-freebsd4.tgz) = cecde2b1986c0e7fb34ed6f5cc195421
+MD5 (drwebd-4.27-freebsd4.tgz) = 1ea2c05c821bef64c3d050e971ad46e5
+MD5 (drwebd_4.27_freebsd4_update.tgz) = 398d0d32e9d7a096aa3db452e846ef9a
diff --git a/security/drweb/files/ini-patch b/security/drweb/files/ini-patch
index ff0f45f52c25..1a2a0335098c 100644
--- a/security/drweb/files/ini-patch
+++ b/security/drweb/files/ini-patch
@@ -1,5 +1,5 @@
---- drweb32.ini-tmpl.orig	Mon Oct 15 19:26:56 2001
-+++ drweb32.ini-tmpl	Mon Oct 15 19:30:53 2001
+--- 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]
@@ -9,26 +9,28 @@
  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?
-@@ -37,7 +37,7 @@
+@@ -30,7 +30,7 @@
+ ScanSubDirectories = Yes
  PromptOnAction = No
- PromptFloppy = No
  LimitLog = No
 -MaxLogSize = 512
 +;MaxLogSize = 512
- OutputMode = Color
+ OutputMode = Terminal
  FollowLinks = No
  
-@@ -48,21 +48,23 @@
- FilesTypes = INI,MBR,IMG,CSC,CPL,MBP,SHS,SHB,PIF
+@@ -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
@@ -46,3 +48,11 @@
  ;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/update-patch b/security/drweb/files/update-patch
deleted file mode 100644
index 348148571581..000000000000
--- a/security/drweb/files/update-patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- update.pl.bak	Tue Jul 31 18:42:13 2001
-+++ update.pl	Sat Aug 25 03:16:22 2001
-@@ -15,9 +15,9 @@
- use String::CRC32;
- 
- my $version = '426';
--my $url = $ARGV[1] || 'http://www.drweb.ru/ftp/update_free/linux/drweb32.lst';
-+#my $url = $ARGV[1] || 'http://www.drweb.ru/ftp/update_free/linux/drweb32.lst';
- #my $url = $ARGV[1] || 'http://www.drweb.ru/ftp/update_free/freebsd3/drweb32.lst';
--#my $url = $ARGV[1] || 'http://www.drweb.ru/ftp/update_free/freebsd4/drweb32.lst';
-+my $url = $ARGV[1] || 'http://www.drweb.ru/ftp/update_free/freebsd4/drweb32.lst';
- 
- my $fetch = ''; # autotest for fetch, wget
- unless ( $fetch ) { $fetch.=" -q -o" if chomp ( $fetch = `which fetch` ); }
diff --git a/security/drweb/pkg-install b/security/drweb/pkg-install
index a9788a54cf32..7b562be695b1 100644
--- a/security/drweb/pkg-install
+++ b/security/drweb/pkg-install
@@ -48,5 +48,5 @@ if ! grep -q ${USER} /etc/crontab; then
 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 ${USER} -g ${BINGRP} ${PKG_PREFIX}/drweb/infected
 exit 0
diff --git a/security/drweb/pkg-plist b/security/drweb/pkg-plist
index a11817423f59..bd33d113caf6 100644
--- a/security/drweb/pkg-plist
+++ b/security/drweb/pkg-plist
@@ -1,19 +1,15 @@
 drweb/CHANGES
 drweb/README
 drweb/README.RUS
-drweb/clients/Changes
 drweb/clients/cgp/README
 drweb/clients/cgp/readme.cgp
 drweb/clients/cgp/readme.cgp.rus
 drweb/clients/demo/drwebdc-demo.c
 drweb/clients/demo/drwebdc-demo.h
-drweb/clients/demo/drwebdc-demo.pl
 drweb/clients/demo/drwebdc-ex1.c
 drweb/clients/demo/drwebdc-ex2.c
 drweb/clients/demo/drwebdc-ex3.c
-drweb/clients/demo/drwebdc-lib.pl
 drweb/clients/demo/drwebdc-tools.c
-drweb/clients/demo/eicar.txt
 drweb/clients/demo/make-all.sh
 drweb/clients/drwebdc/ChangeLog
 drweb/clients/drwebdc/Makefile.aix
@@ -92,6 +88,8 @@ drweb/doc/drweb-ini
 drweb/doc/drweb-ini.rus
 drweb/doc/drwebd-api
 drweb/doc/drwebd-api.rus
+drweb/doc/history.txt
+drweb/doc/readme.eicar
 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
@@ -125,7 +123,7 @@ drweb/update/update.pl
 @dirrm drweb/clients/sendmail
 @dirrm drweb/clients
 @dirrm drweb/doc
-@dirrm drweb/infected.!!!
+@dirrm drweb/infected
 @dirrm drweb/run
 @dirrm drweb/update
 @dirrm drweb