4 files changed, 65 insertions, 8 deletions

diff --git a/security/drweb/Makefile b/security/drweb/Makefile
index a52ed65d0c42..f670ea7ee6f5 100644
--- a/security/drweb/Makefile
+++ b/security/drweb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	drweb
 PORTVERSION=    4.26
+PORTREVISION=   1
 CATEGORIES=	security
 MASTER_SITES=	http://www.drweb.ru/ftp/web_pub/
 DISTNAME=	${PORTNAME}d-${PORTVERSION}-freebsd4
@@ -25,15 +26,22 @@ do-install:
 	-@${MKDIR} -v ${DRWEB_PREFIX}
 	@cd ${DRWEB_PREFIX}; ${RM} -f drw*.txt drw*.vdb drweb drwebd
 	${TAR} -xzf ${WRKSRC}/${DISTNAME}.tar.gz -C ${DRWEB_PREFIX} --exclude *.ini
-	${TAR} -xzOf ${WRKSRC}/${DISTNAME}.tar.gz drweb32.ini | \
+	${TAR} -xzOf ${WRKSRC}/${DISTNAME}.tar.gz drweb32.ini \
+		> ${DRWEB_PREFIX}/drweb32.ini-tmpl
+	cd ${DRWEB_PREFIX}; \
+		${PATCH} -s < ${FILESDIR}/ini-patch && \
+		${RM} drweb32.ini-tmpl.orig
+	cd ${DRWEB_PREFIX}; \
 		${SED} 's#__INSTALL_DIR__#${DRWEB_PREFIX}#' \
-		> ${DRWEB_PREFIX}/drweb32.ini-dist
+		< drweb32.ini-tmpl > drweb32.ini-dist && \
+		${RM} drweb32.ini-tmpl
 	if [ ! -f ${DRWEB_PREFIX}/drweb32.ini ] ; then \
 		${CP} ${DRWEB_PREFIX}/drweb32.ini-dist \
 		      ${DRWEB_PREFIX}/drweb32.ini; \
 	fi
 	${SED} 's#!!PREFIX!!#${DRWEB_PREFIX}#' < ${FILESDIR}/drwebd.sh >${WRKSRC}/drwebd.sh
-	cd ${DRWEB_PREFIX}/update; patch -s < ${FILESDIR}/update-patch && ${RM} update.pl.orig
-	${INSTALL_DATA} ${WRKSRC}/drwebd.sh ${PREFIX}/etc/rc.d/drwebd.sh-dist
+	cd ${DRWEB_PREFIX}/update; \
+		${PATCH} -s < ${FILESDIR}/update-patch && ${RM} update.pl.orig
+	${INSTALL_SCRIPT} ${WRKSRC}/drwebd.sh ${PREFIX}/etc/rc.d/
 
 .include <bsd.port.mk>
diff --git a/security/drweb/files/drwebd.sh b/security/drweb/files/drwebd.sh
index ed9be3b62f77..bfffe8b64255 100644
--- a/security/drweb/files/drwebd.sh
+++ b/security/drweb/files/drwebd.sh
@@ -9,11 +9,12 @@ start)
 	if [ -x $drwebd ]; then
 	    echo -n ' drwebd'
 	    $drwebd
+	    /bin/chmod 660 /var/run/drwebd.sock
 	fi
 	;;
 stop)
 	/usr/bin/killall drwebd
-	/bin/rm -f /var/run/drwebd
+	/bin/rm -f /var/run/drwebd.sock
 	echo -n ' drwebd'
 	;;
 *)
diff --git a/security/drweb/files/ini-patch b/security/drweb/files/ini-patch
new file mode 100644
index 000000000000..b0a32e91ae06
--- /dev/null
+++ b/security/drweb/files/ini-patch
@@ -0,0 +1,50 @@
+--- drweb32.ini-tmpl.orig	Wed Oct  3 10:27:06 2001
++++ drweb32.ini-tmpl	Wed Oct  3 10:31:53 2001
+@@ -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?
+@@ -37,7 +37,7 @@
+ PromptOnAction = No
+ PromptFloppy = No
+ LimitLog = No
+-MaxLogSize = 512
++;MaxLogSize = 512
+ OutputMode = Color
+ FollowLinks = No
+ 
+@@ -47,22 +47,23 @@
+ FilesTypes = XL?,WIZ,RTF,CL*,HT*,VB*,JS*,INF,AR?,ZIP,R??,PP?,OBJ,LIB,HLP,MD?
+ FilesTypes = INI,MBR,IMG,CSC,CPL,MBP,SHS,SHB,PIF
+ LogTime = Yes
+-LogFileName = "syslog"
++LogFileName = "/var/log/drwebd.log"
+ ;BusyFile = "/var/run/drwebd.bsy"
+-SocketMode = TCP
+-;SocketMode = Unix
++;SocketMode = TCP
++SocketMode = Unix
++SocketFile = "/var/run/drwebd.sock"
+ DaemonPort = 3000
+ SocketTimeout = 40
+ SocketReuseAddr = Yes
+ FileTimeout = 40
+-OutputMode = Terminal
+-LimitLog = No
++OutputMode = Quiet
++LimitLog = Yes
+ MaxLogSize = 512
+ LogScanned = Yes
+ LogInfo = Yes
+ LogPacked = Yes
+ Interfaces = "localhost"
+-;User = drweb
++User = root
+ ;UserID = 
+ ;GroupID = 
+ ScanFiles = All
diff --git a/security/drweb/pkg-plist b/security/drweb/pkg-plist
index d19e3d0ba46f..8c797773a3b9 100644
--- a/security/drweb/pkg-plist
+++ b/security/drweb/pkg-plist
@@ -93,11 +93,9 @@ drweb/russian.dwl
 drweb/update/readme.update
 drweb/update/readme.update.rus
 drweb/update/update.pl
-etc/rc.d/drwebd.sh-dist
+etc/rc.d/drwebd.sh
 @dirrm drweb/clients/cgp
 @dirrm drweb/clients/demo
-@dirrm drweb/clients/drwebdc/include
-@dirrm drweb/clients/drwebdc/lib
 @dirrm drweb/clients/drwebdc/src
 @dirrm drweb/clients/drwebdc
 @dirrm drweb/clients/exim