- Update to 4.30, now with native FreeBSD 5.x binary

PR:		ports/58998
Submitted by:	Xin LI <delphij at frontfree dot net>
Approved by:	maintainer timeout (3 months)

8 files changed, 216 insertions, 131 deletions

diff --git a/security/drweb/Makefile b/security/drweb/Makefile
index 8a7cda0..7eb10e5 100644
--- a/security/drweb/Makefile
+++ b/security/drweb/Makefile
@@ -6,29 +6,34 @@
 #
 
 PORTNAME=	drweb
-PORTVERSION=    4.29.5
-PORTREVISION=   1
+PORTVERSION=	4.30
 CATEGORIES=	security
-MASTER_SITES=   ftp://ftp.drweb.ru/pub/unix/${PORTVERSION}/
-DISTFILES=      ${MAIN_NAME}.tar.gz
+MASTER_SITES=	ftp://ftp.drweb.ru/pub/unix/
+DISTFILES=	${MAIN_NAME}.tar.gz
 
 MAINTAINER=	anton@chelcom.ru
 COMMENT=	DrWeb antivirus suite
 
 ONLY_FOR_ARCHS=	i386
-NO_BUILD=       yes
+NO_BUILD=	yes
 
-WRKSRC=         ${WRKDIR}/${MAIN_NAME}/install
+WRKSRC=		${WRKDIR}/${MAIN_NAME}
 
-LIB_DEPENDS+=   c.4:${PORTSDIR}/misc/compat4x
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+LIB_DEPENDS+=	c.4:${PORTSDIR}/misc/compat4x
+MAIN_NAME=	${PORTNAME}-${PORTVERSION}-freebsd4
+.else
+MAIN_NAME=	${PORTNAME}-${PORTVERSION}-freebsd5
+.endif
 
-MAIN_NAME=      ${PORTNAME}-${PORTVERSION}-freebsd4
 DRWEB_PREFIX=	${PREFIX}/${PORTNAME}
 
 do-install:
 	-@install -dv -o ${BINOWN} -g ${BINGRP} ${DRWEB_PREFIX}
-	@cd ${DRWEB_PREFIX}; ${RM} -f drweb drwebd bases/* updates/*
-	${TAR} -cf - -C ${WRKSRC}/opt/drweb . | \
+	@cd ${DRWEB_PREFIX}; ${RM} -f drweb drwebd bases/* updates/*; ${MKDIR} updates
+	${TAR} -cf - -C ${WRKSRC}/usr/local/drweb . | \
 		${TAR} -xf - -C ${DRWEB_PREFIX} \
 		--exclude "*.key" \
 		--exclude "*.static" \
@@ -37,25 +42,25 @@ do-install:
 		${TAR} -xf - -C ${DRWEB_PREFIX}
 	chmod 755 ${DRWEB_PREFIX}/bases ${DRWEB_PREFIX}/doc \
 		${DRWEB_PREFIX}/lib ${DRWEB_PREFIX}/updates
-	${INSTALL_DATA} ${WRKSRC}/opt/drweb/drweb.key \
+	${INSTALL_DATA} ${WRKSRC}/usr/local/drweb/drweb.key \
 		${DRWEB_PREFIX}/drweb.key-dist
-	${INSTALL_DATA} ${WRKSRC}/opt/drweb/drwebd.key \
+	${INSTALL_DATA} ${WRKSRC}/usr/local/drweb/drwebd.key \
 		${DRWEB_PREFIX}/drwebd.key-dist
 	${SED} 's#%INSTALL%#${DRWEB_PREFIX}#g' \
-		< ${WRKSRC}/opt/drweb/update/update.pl \
+		< ${WRKSRC}/usr/local/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
+		< ${WRKSRC}/usr/local/etc/drweb/drweb32.ini \
+		> ${PREFIX}/drweb/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; \
+		< ${WRKSRC}/usr/local/etc/rc.d/00drwebd.sh \
+		> ${PREFIX}/etc/rc.d/00drwebd.sh
+	chmod 755 ${PREFIX}/etc/rc.d/00drwebd.sh
+	if [ ! -f ${PREFIX}/drweb/drweb32.ini ] ; then \
+		${CP} ${PREFIX}/drweb/drweb32.ini-dist \
+		      ${PREFIX}/drweb/drweb32.ini; \
 	fi
 	if [ ! -f ${DRWEB_PREFIX}/drweb.key ] ; then \
 		${CP} ${DRWEB_PREFIX}/drweb.key-dist \
@@ -69,4 +74,4 @@ do-install:
 post-install:
 	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/security/drweb/distinfo b/security/drweb/distinfo
index f36a836..ddf19fc 100644
--- a/security/drweb/distinfo
+++ b/security/drweb/distinfo
@@ -1 +1,2 @@
-MD5 (drweb-4.29.5-freebsd4.tar.gz) = 9a0c9a9822b5e8714f28677826fe3aff
+MD5 (drweb-4.30-freebsd4.tar.gz) = 1f85f539fb946376d61e51b0984616cc
+MD5 (drweb-4.30-freebsd5.tar.gz) = 1b7eb3f2472ff0f85acd66729c62c70d
diff --git a/security/drweb/files/drweb.sh b/security/drweb/files/drweb.sh
deleted file mode 100644
index a4c863e..0000000
--- a/security/drweb/files/drweb.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec %INSTALL%/drweb -ini:%INSTALL%/drweb32.ini $*
diff --git a/security/drweb/files/patch-aa b/security/drweb/files/patch-aa
index c1b5c25..adfe58b 100644
--- a/security/drweb/files/patch-aa
+++ b/security/drweb/files/patch-aa
@@ -1,92 +1,148 @@
---- etc/drweb/drweb32.ini.orig	Mon Jan  6 21:03:02 2003
-+++ etc/drweb/drweb32.ini	Sat Jun  7 12:32:31 2003
-@@ -1,11 +1,11 @@
- [Scanner]
--EnginePath = "/opt/drweb/lib/drweb32.dll"
--VirusBase = "/var/drweb/bases/*.vdb", "/var/drweb/bases/*.VDB"
--MoveFilesTo = "/var/drweb/infected"
--;LngFileName = "/opt/drweb/lib/russian.dwl"
+--- usr/local/etc/drweb/drweb32.ini.orig	Thu Oct  9 15:06:27 2003
++++ usr/local/etc/drweb/drweb32.ini	Thu Nov  6 18:49:39 2003
+@@ -7,23 +7,23 @@
+ ;        also used by the updating module to update the search module. You
+ ;        may specify relational path, but it is strongly recommended to make
+ ;        it absolute.
+-EnginePath = "/usr/local/drweb/lib/drweb32.dll"
 +EnginePath = "%INSTALL%/lib/drweb32.dll"
-+VirusBase = "%INSTALL%/bases/*.vdb", "%INSTALL%/bases/*.VDB"
-+MoveFilesTo = "%INSTALL%/infected"
+ 
+ ;VirusBase = { list of the paths (masks) to the files, usual extension is vdb }
+ ;        Masks for the loaded virus bases. This parameter is also used by
+ ;        the updating module to update antivirus' bases. A few masks can be
+ ;        enumerated.
+-VirusBase = "/var/drweb/bases/*.vdb"
++VirusBase = "%INSTALL%/bases/*.vdb"
+ 
+ ;LngFileName = { path to the language resource file, usual extension - dwl }
+ ;        Localization file location.
+-;LngFileName = "/usr/local/drweb/lib/russian.dwl"
 +;LngFileName = "%INSTALL%/lib/russian.dwl"
  
--Key = "/opt/drweb/drweb.key"
--LogFileName = "/var/drweb/log/drweb.log"
-+Key = "%INSTALL%/drweb.key"
-+LogFileName = "/dev/null"
+ ;Key = {path to the file, usual extension is key }
+ ;        Location of the file with the registration key. You may specify
+ ;        relational path, but it is strongly recommended to make it
+ ;        absolute.
+-Key = "/usr/local/drweb/drwebd.key"
++Key = "%INSTALL%/drwebd.key"
+ 
+ ; --- Scanning settings: ---
+ 
+@@ -96,7 +96,7 @@
+ ;        of their importance, you can find out where the daemon's report will
+ ;        be written to, basing on these two parameters and the contents of
+ ;        the configuration file syslog (usually /etc/syslogd.conf).
+-LogFileName = "/var/drweb/log/drwebd.log"
++LogFileName = "%INSTALL%/log/drwebd.log"
+ ;LogFileName = "syslog"
+ ;SyslogFacility = "Daemon"
+ ;SyslogPriority = "Info"
+@@ -141,7 +141,7 @@
+ ;OutputMode = { Terminal | Quiet }
+ ;        Mode of output information on the console, Quiet cancels
+ ;        output.
+-OutputMode = Terminal
++OutputMode = Quiet
+ 
+ ;--- User settings: ---
+ 
+@@ -170,10 +170,11 @@
+ ;        Example: Socket 3000 127.0.0.1, 192.168.0.100
+ ;        The second form describes unix-socket, {file} - socket name,
+ ;        {access} - octal value of access rights.
+-;        Example: Socket /var/run/drwebd.socket 666 
++;        Example: Socket /var/run/drwebd.socket 666
+ ;        Number of socket keys is not limited, daemon will work with all
+ ;        correctly described sockets.
+-Socket = 3000 127.0.0.1
++;Socket 3000 127.0.0.1
++Socket = %INSTALL%/run/drwebd.sock 660
+ 
+ ;ListeningQueue = "value"
+ ;        Defines sockets queue maximum size. Value may vary from 0 to
+@@ -187,7 +188,7 @@
+ ;        Default value:
+ ;               "/var/run/drwebd.pid" (Attention!!! Only the programs executed
+ ;               with the root rights have write access to /var/run).
+-PidFile = "/var/drweb/run/drwebd.pid"
++PidFile = "%INSTALL%/run/drwebd.pid"
+ 
+ ;BusyFile = { path to file }
+ ;        Daemon's busy file name: it is created by the scanning "copy" of
+@@ -196,7 +197,7 @@
+ ;        every "copy" of the daemon gets expanded with a point and ASCIIZ
+ ;        representation of PID (e.g., /var/run/drwebd.bsy.123456).
+ ;        Default value: absent (file does not get created)
+-;BusyFile = "/var/drweb/run/drwebd.bsy"
++;BusyFile = "%INSTALL%/run/drwebd.bsy"
+ 
+ ;MaxChildren = "value"

+ ;        Sets maximum amount of simultaneously working child (scanning)
+@@ -252,12 +253,12 @@
+ ;        MaxCompressionRatio switch). 
+ ;CompressionCheckThreshold = 1024
+ 
+-MoveFilesTo = "/var/drweb/infected"
++MoveFilesTo = "%INSTALL%/infected"
  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,42 +30,42 @@
- ScanSubDirectories = Yes
- PromptOnAction = No
- LimitLog = No
--MaxLogSize = 512
-+;MaxLogSize = 512
- OutputMode = Terminal
- FollowLinks = No
- 
--UpdatePath = "/opt/drweb/updates"
+ 
+ ;UpdatePath = path
+ ;       This parameter used bu update script.
+-UpdatePath = "/var/drweb/updates"
 +UpdatePath = "%INSTALL%/updates"
  
- RecodeNonprintable = Yes
- RecodeMode = QuotedPrintable
- RecodeChar = "?"
+ ;--- Filter settings: ---
+ ;
+@@ -318,23 +319,23 @@
+ ;        also used by the updating module to update the search module. You
+ ;        may specify relational path, but it is strongly recommended to make
+ ;        it absolute.
+-EnginePath = "/usr/local/drweb/lib/drweb32.dll"
++EnginePath = "%INSTALL%/lib/drweb32.dll"
  
- [Daemon]
--EnginePath = "/opt/drweb/lib/drweb32.dll"
+ ;VirusBase = { list of the paths (masks) to the files, usual extension is vdb }
+ ;        Masks for the loaded virus bases. This parameter is also used by
+ ;        the updating module to update antivirus' bases. A few masks can be
+ ;        enumerated.
 -VirusBase = "/var/drweb/bases/*.vdb", "/var/drweb/bases/*.VDB"
--MoveFilesTo = "/var/drweb/infected"
--;LngFileName = "/opt/drweb/lib/russian.dwl"
-+EnginePath = "%INSTALL%/lib/drweb32.dll"
 +VirusBase = "%INSTALL%/bases/*.vdb", "%INSTALL%/bases/*.VDB"
-+MoveFilesTo = "%INSTALL%/infected"
+ 
+ ;LngFileName = { path to the language resource file, usual extension - dwl }
+ ;        Localization file location.
+-;LngFileName = "/usr/local/drweb/lib/russian.dwl"
 +;LngFileName = "%INSTALL%/lib/russian.dwl"
  
--Key = "/opt/drweb/drwebd.key"
-+Key = "%INSTALL%/drwebd.key"
- LogTime = Yes
- LogFileName = "syslog"
--;LogFileName = "/var/drweb/log/drwebd.log"
--;BusyFile = "/var/drweb/run/drwebd.bsy"
--;PidFile = "/var/drweb/run/drwebd.pid"
-+;LogFileName = "/var/log/drwebd.log"
-+;BusyFile = "%INSTALL%/run/drwebd.bsy"
-+PidFile = "%INSTALL%/run/drwebd.pid"
+ ;Key = {path to the file, usual extension is key }
+ ;        Location of the file with the registration key. You may specify
+ ;        relational path, but it is strongly recommended to make it
+ ;        absolute.
+-Key = "/usr/local/drweb/drweb.key"
++Key = "%INSTALL%/drweb.key"
  
--Socket 3000 127.0.0.1
--;Scket /var/drweb/run/drwebd.socket 666
-+;Socket 3000 127.0.0.1
-+Socket = %INSTALL%/run/drwebd.sock 660
+ ;FilesTypes = { extension list }
+ ;        Types of files that will get checked if by type scanning is
+@@ -410,7 +411,7 @@
+ ActionInfectedMail = Report
+ ActionInfectedContainer = Report
  
- SocketTimeout = 40
- SocketReuseAddr = Yes
- FileTimeout = 40
--OutputMode = Terminal
-+OutputMode = Quiet
- LimitLog = No
--MaxLogSize = 512
-+;MaxLogSize = 512
- LogScanned = Yes
- LogInfo = Yes
- LogPacked = Yes
--;User = drweb
-+User = drweb
- ;UserID = 
- ;GroupID = 
- ScanFiles = All
-@@ -75,10 +75,10 @@
- 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"
-+UpdatePath = "%INSTALL%/updates"
+-MoveFilesTo = "/var/drweb/infected"
++MoveFilesTo = "%INSTALL%/infected"
+ RenameFilesTo = #??
+ 
+ ;LogFileName = { file name }
+@@ -421,7 +422,7 @@
+ ;        of their importance, you can find out where the daemon's report will
+ ;        be written to, basing on these two parameters and the contents of
+ ;        the configuration file syslog (usually /etc/syslogd.conf).
+-LogFileName = "/var/drweb/log/drweb.log"
++LogFileName = "%INSTALL%/log/drweb.log"
+ 
+ ;LogScanned = { Yes | No }
+ ;        Should the information on all the checked objects independently
+@@ -467,5 +468,5 @@
+ 
+ ;UpdatePath = path
+ ;       This parameter used bu update script.
+-UpdatePath = /usr/local/drweb/updates
++UpdatePath = %INSTALL%/updates
  
- RecodeNonprintable = Yes
- RecodeMode = QuotedPrintable
diff --git a/security/drweb/files/patch-ab b/security/drweb/files/patch-ab
index 62ae2fd..0f9e45e 100644
--- a/security/drweb/files/patch-ab
+++ b/security/drweb/files/patch-ab
@@ -1,20 +1,20 @@
---- 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 @@
+--- usr/local/drweb/update/update.pl.orig	Sat Nov  1 07:59:33 2003
++++ usr/local/drweb/update/update.pl	Sat Nov  1 08:00:54 2003
+@@ -41,7 +41,7 @@
  my $ini = $ARGV[0];
  if( $ini eq '' )
  {
--  $ini = "/etc/drweb/drweb32.ini";
-+  $ini = "%INSTALL%/drweb32.ini";
+-  $ini = '/usr/local/etc/drweb/drweb32.ini' if $^O =~ /BSD/i;  
++  $ini = '%INSTALL%/drweb32.ini' if $^O =~ /BSD/i;  
+   $ini = '/etc/drweb/drweb32.ini' if $ini eq '';    
  }
  
- my $fetch = "fetch -q -o";
-@@ -52,7 +52,7 @@
+@@ -79,7 +79,7 @@
     die "Bases path is not defined!" unless $bases;
     die "Update path is not defined!" unless $update;
     
 -   $pidFile = "/var/drweb/run/drwebd.pid" if( $pidFile eq '' );
-+   $pidFile = "%INSTALL%/run/drwebd.pid" if( $pidFile eq '' );
++   $pidFile = "%INSTALL%/drwebd.pid" if( $pidFile eq '' );
  
  my $version = readVersion( $engine ); 
     die "Engine version error (invalid engine?)" unless $version;
diff --git a/security/drweb/files/patch-ac b/security/drweb/files/patch-ac
new file mode 100644
index 0000000..79aab34
--- /dev/null
+++ b/security/drweb/files/patch-ac
@@ -0,0 +1,28 @@
+--- usr/local/etc/rc.d/00drwebd.sh.orig	Sat Nov  1 08:03:03 2003
++++ usr/local/etc/rc.d/00drwebd.sh	Sat Nov  1 08:06:38 2003
+@@ -3,20 +3,20 @@
+ case "$1" in
+     stop)
+ 	echo -n "Shutting down Dr. Web daemon..."
+-	kill `cat /var/drweb/run/drwebd.pid | head -1`
++	kill `cat %INSTALL%/run/drwebd.pid | head -1`
+     ;;
+     reload)
+ 	echo -n "Reloading Dr. Web daemon..."
+-	kill -HUP `cat /var/drweb/run/drwebd.pid | head -1`
++	kill -HUP `cat %INSTALL%/run/drwebd.pid | head -1`
+     ;;
+     restart)
+ 	echo -n "Restarting Dr. Web daemon..."
+-	kill `cat /var/drweb/run/drwebd.pid | head -1`
++	kill `cat %INSTALL%/run/drwebd.pid | head -1`
+ 	sleep 1
+-	/usr/local/drweb/drwebd
++	%INSTALL%/drwebd
+     ;;
+     *)
+ 	echo -n "Starting Dr. Web daemon..."
+-	/usr/local/drweb/drwebd
++	%INSTALL%/drwebd -ini:%INSTALL%/drweb32.ini
+ esac
+ 
diff --git a/security/drweb/pkg-message b/security/drweb/pkg-message
index 0f377f6..d0794641 100644
--- a/security/drweb/pkg-message
+++ b/security/drweb/pkg-message
@@ -6,4 +6,3 @@ http://drweb.imshop.de/index_e.htm
 or
 
 http://www.drweb.ru/buy.shtml
-
diff --git a/security/drweb/pkg-plist b/security/drweb/pkg-plist
index 9cf32ae..aa9bd44 100644
--- a/security/drweb/pkg-plist
+++ b/security/drweb/pkg-plist
@@ -1,18 +1,17 @@
 @comment $FreeBSD$
-bin/drweb
 drweb/ChangeLog
 drweb/README
 drweb/README.RUS
+drweb/bases/drw43001.vdb
+drweb/bases/drw43002.vdb
+drweb/bases/drw43003.vdb
+drweb/bases/drw43004.vdb
+drweb/bases/drw43005.vdb
+drweb/bases/drw43006.vdb
+drweb/bases/drw43007.vdb
+drweb/bases/drw43008.vdb
+drweb/bases/drw43009.vdb
 drweb/bases/drwebase.vdb
-drweb/clients/demo/drwebdc-demo.c
-drweb/clients/demo/drwebdc-demo.h
-drweb/clients/demo/drwebdc-ex1.c
-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/drwebd-api
-drweb/clients/drwebdc
 drweb/doc/readme.daemon
 drweb/doc/readme.daemon.rus
 drweb/doc/readme.eicar
@@ -29,18 +28,18 @@ 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/drwebdc
 drweb/lib/drweb32.dll
 drweb/lib/russian.dwl
 drweb/update/readme.update
 drweb/update/readme.update.rus
 drweb/update/update.pl
-@dirrm drweb/bases
-@dirrm drweb/clients/demo
-@dirrm drweb/clients
-@dirrm drweb/doc
-@dirrm drweb/infected
-@dirrm drweb/lib
-@dirrm drweb/run
-@dirrm drweb/update
+etc/rc.d/00drwebd.sh
 @dirrm drweb/updates
+@dirrm drweb/update
+@dirrm drweb/run
+@dirrm drweb/lib
+@dirrm drweb/infected
+@dirrm drweb/doc
+@dirrm drweb/bases
 @dirrm drweb