Date: Thu, 25 Mar 2004 16:38:28 +0200 (EET) From: Serge Negodyuck <petr@petrovich.kiev.ua> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/64711: update: ports/security/drweb Message-ID: <200403251438.i2PEcStX095803@petrovich.com.ua> Resent-Message-ID: <200403251450.i2PEoDhJ040878@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 64711 >Category: ports >Synopsis: update: ports/security/drweb >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Mar 25 06:50:13 PST 2004 >Closed-Date: >Last-Modified: >Originator: Serge Negodyuck >Release: FreeBSD 4.9-STABLE i386 >Organization: >Environment: System: FreeBSD petrovich.com.ua 4.9-STABLE >Description: ports/security/drweb Cosmetic fixes: - fix rc.d/00drweb.sh script to give proper command line option - added drweb script in bin dir to call scanner - remove not nessessary variable MAIN_NAME in Makefile - approach port to standarts of potlint >How-To-Repeat: >Fix: diff -ruN drweb/Makefile drweb-new/Makefile --- drweb/Makefile Thu Mar 25 02:15:48 2004 +++ drweb-new/Makefile Thu Mar 25 16:28:02 2004 @@ -7,11 +7,11 @@ PORTNAME= drweb PORTVERSION= 4.31.3 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= ftp://ftp.drweb.ru/pub/unix/ \ ftp://ftp.drweb.ru/pub/unix/archive/ \ ftp://ftp.drweb.ru/pub/unix/archive/${PORTNAME}-${PORTVERSION}/ -DISTFILES= ${MAIN_NAME}.tar.gz MAINTAINER= ports@FreeBSD.org COMMENT= DrWeb antivirus suite @@ -19,21 +19,21 @@ ONLY_FOR_ARCHS= i386 NO_BUILD= yes -WRKSRC= ${WRKDIR}/${MAIN_NAME} - .include <bsd.port.pre.mk> .if ${OSVERSION} < 500000 LIB_DEPENDS+= c.4:${PORTSDIR}/misc/compat4x -MAIN_NAME= ${PORTNAME}-${PORTVERSION}-freebsd4 +DISTNAME= ${PORTNAME}-${PORTVERSION}-freebsd4 .else -MAIN_NAME= ${PORTNAME}-${PORTVERSION}-freebsd5 +DISTNAME= ${PORTNAME}-${PORTVERSION}-freebsd5 .endif +WRKSRC= ${WRKDIR}/${DISTNAME} + DRWEB_PREFIX= ${PREFIX}/${PORTNAME} do-install: - -@install -dv -o ${BINOWN} -g ${BINGRP} ${DRWEB_PREFIX} + -@${INSTALL} -dv -o ${BINOWN} -g ${BINGRP} ${DRWEB_PREFIX} @cd ${DRWEB_PREFIX}; ${RM} -f drweb drwebd bases/* updates/*; ${MKDIR} updates ${TAR} -cf - -C ${WRKSRC}/usr/local/drweb . | \ ${TAR} -xf - -C ${DRWEB_PREFIX} \ @@ -42,7 +42,7 @@ --exclude "update/update.pl*" ${TAR} -cf - -C ${WRKSRC}/var/drweb bases | \ ${TAR} -xf - -C ${DRWEB_PREFIX} - chmod 755 ${DRWEB_PREFIX}/bases ${DRWEB_PREFIX}/doc \ + ${CHMOD} 755 ${DRWEB_PREFIX}/bases ${DRWEB_PREFIX}/doc \ ${DRWEB_PREFIX}/lib ${DRWEB_PREFIX}/updates ${INSTALL_DATA} ${WRKSRC}/usr/local/drweb/drweb.key \ ${DRWEB_PREFIX}/drweb.key-dist @@ -51,7 +51,7 @@ ${SED} 's#%INSTALL%#${DRWEB_PREFIX}#g' \ < ${WRKSRC}/usr/local/drweb/update/update.pl \ > ${DRWEB_PREFIX}/update/update.pl - chmod 750 ${DRWEB_PREFIX}/update/update.pl + ${CHMOD} 750 ${DRWEB_PREFIX}/update/update.pl ${SED} 's#%INSTALL%#${DRWEB_PREFIX}#g' \ < ${WRKSRC}/usr/local/etc/drweb/drweb32.ini \ > ${PREFIX}/drweb/drweb32.ini-dist @@ -59,7 +59,7 @@ ${SED} 's#%INSTALL%#${DRWEB_PREFIX}#g' \ < ${WRKSRC}/usr/local/etc/rc.d/00drwebd.sh \ > ${PREFIX}/etc/rc.d/00drwebd.sh - chmod 755 ${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; \ @@ -72,6 +72,10 @@ ${CP} ${DRWEB_PREFIX}/drwebd.key-dist \ ${DRWEB_PREFIX}/drwebd.key; \ fi + ${SED} 's#%INSTALL%#${DRWEB_PREFIX}#g' \ + < ${FILESDIR}/drweb.sh \ + > ${WRKDIR}/drweb + ${INSTALL_SCRIPT} ${WRKDIR}/drweb ${PREFIX}/bin post-install: PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL diff -ruN drweb/files/drweb.sh drweb-new/files/drweb.sh --- drweb/files/drweb.sh Thu Jan 1 03:00:00 1970 +++ drweb-new/files/drweb.sh Thu Mar 25 16:29:07 2004 @@ -0,0 +1,3 @@ +#!/bin/sh + +exec /usr/local/drweb/drweb -ini=%INSTALL%/drweb32.ini $* diff -ruN drweb/files/patch-ac drweb-new/files/patch-ac --- drweb/files/patch-ac Sat Feb 28 17:17:44 2004 +++ drweb-new/files/patch-ac Thu Mar 25 16:06:49 2004 @@ -23,6 +23,6 @@ *) echo -n "Starting Dr. Web daemon..." - /usr/local/drweb/drwebd -+ %INSTALL%/drwebd -ini:%INSTALL%/drweb32.ini ++ %INSTALL%/drwebd -ini=%INSTALL%/drweb32.ini esac diff -ruN drweb/pkg-install drweb-new/pkg-install --- drweb/pkg-install Sun May 19 02:15:00 2002 +++ drweb-new/pkg-install Thu Mar 25 15:57:45 2004 @@ -42,7 +42,7 @@ if ! grep -q ${USER} /etc/crontab; then if ! crontab -l -u ${BINOWN} | grep -q ${USER}; then echo "You may also add this crontab entry to /etc/crontab" - echo "0 12 * * * ${BINOWN} ${PKG_PREFIX}/drweb/update/update.pl ${PKG_PREFIX}/drweb" + echo "0 12 * * * ${BINOWN} ${PKG_PREFIX}/drweb/update/update.pl" echo "" fi fi diff -ruN drweb/pkg-plist drweb-new/pkg-plist --- drweb/pkg-plist Thu Mar 25 02:15:48 2004 +++ drweb-new/pkg-plist Thu Mar 25 16:05:00 2004 @@ -1,4 +1,5 @@ @comment $FreeBSD: ports/security/drweb/pkg-plist,v 1.19 2004/03/24 22:04:13 pav Exp $ +bin/drweb drweb/ChangeLog drweb/README drweb/README.RUS >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200403251438.i2PEcStX095803>