From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Oct 11 10:30:40 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8632016A420 for ; Tue, 11 Oct 2005 10:30:40 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 918C443D4C for ; Tue, 11 Oct 2005 10:30:33 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j9BAUSHi073306 for ; Tue, 11 Oct 2005 10:30:28 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j9BAUSRc073305; Tue, 11 Oct 2005 10:30:28 GMT (envelope-from gnats) Resent-Date: Tue, 11 Oct 2005 10:30:28 GMT Resent-Message-Id: <200510111030.j9BAUSRc073305@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Demin Alexander Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 852D416A41F for ; Tue, 11 Oct 2005 10:27:45 +0000 (GMT) (envelope-from oldman@support.spectrum.ru) Received: from support.spectrum.ru (support.spectrum.ru [62.205.172.195]) by mx1.FreeBSD.org (Postfix) with ESMTP id 17A0643D46 for ; Tue, 11 Oct 2005 10:27:43 +0000 (GMT) (envelope-from oldman@support.spectrum.ru) Received: from support.spectrum.ru (localhost [127.0.0.1]) by support.spectrum.ru (8.13.4/8.13.3) with ESMTP id j9BARbHr057626 for ; Tue, 11 Oct 2005 14:27:37 +0400 (MSD) (envelope-from oldman@support.spectrum.ru) Received: (from root@localhost) by support.spectrum.ru (8.13.4/8.13.3/Submit) id j9BARa83057625; Tue, 11 Oct 2005 14:27:36 +0400 (MSD) (envelope-from oldman) Message-Id: <200510111027.j9BARa83057625@support.spectrum.ru> Date: Tue, 11 Oct 2005 14:27:36 +0400 (MSD) From: Demin Alexander To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/87247: Update security/drweb to 4.33 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Demin Alexander List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Oct 2005 10:30:40 -0000 >Number: 87247 >Category: ports >Synopsis: Update security/drweb to 4.33 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Oct 11 10:30:18 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Demin Alexander >Release: FreeBSD 5.4-STABLE i386 >Organization: Group of companies Spectrum >Environment: System: FreeBSD support.spectrum.ru 5.4-STABLE FreeBSD 5.4-STABLE #14: Thu Sep 15 18:03:13 MSD 2005 oldman@support.spectrum.ru:/usr/obj/usr/src/sys/MYGENERIC i386 >Description: Update version security/drweb up to 4.33 (Antivirus Software) >How-To-Repeat: First time remove: security/drweb/files security/drweb/pkg-message Then use this diff. >Fix: --- drweb_up_4.32.2_to_4.33 begins here --- diff -ruN security/drweb_4.32.2/Makefile security/drweb/Makefile --- security/drweb_4.32.2/Makefile Sat Aug 27 04:30:19 2005 +++ security/drweb/Makefile Tue Oct 11 12:56:49 2005 @@ -6,11 +6,10 @@ # PORTNAME= drweb -PORTVERSION= 4.32.2 -PORTREVISION= 1 +PORTVERSION= 4.33 CATEGORIES= security -MASTER_SITES= ftp://ftp.drweb.ru/pub/unix/FreeBSD/49/ \ - ftp://ftp.drweb.ru/pub/unix/FreeBSD/53/ +MASTER_SITES= ftp://ftp.drweb.ru/pub/unix/FreeBSD/411/ \ + ftp://ftp.drweb.ru/pub/unix/FreeBSD/54/ MAINTAINER= support@spectrum.ru COMMENT= DrWeb antivirus suite @@ -23,9 +22,9 @@ .include .if ${OSVERSION} < 500000 -DISTNAME= ${PORTNAME}-${PORTVERSION}-freebsd49 +DISTNAME= ${PORTNAME}-${PORTVERSION}-freebsd411 .else -DISTNAME= ${PORTNAME}-${PORTVERSION}-freebsd53 +DISTNAME= ${PORTNAME}-${PORTVERSION}-freebsd54 .if ${OSVERSION} >= 600000 LIB_DEPENDS+= c.5:${PORTSDIR}/misc/compat5x .endif @@ -34,53 +33,39 @@ WRKSRC= ${WRKDIR}/${DISTNAME} DRWEB_PREFIX= ${PREFIX}/${PORTNAME} - -pre-everything:: - @${ECHO_MSG} "" - @${ECHO_MSG} "Warning!" - @${ECHO_MSG} "4.32* version not supported in the .key files of 4.31* version and older." - @${ECHO_MSG} "Press Ctrl-C if you want to stop installation." - @${ECHO_MSG} "" +DRWEB_VARPREFIX=/var/drweb do-install: - -@${INSTALL} -dv -o ${BINOWN} -g ${BINGRP} ${DRWEB_PREFIX} - @cd ${DRWEB_PREFIX}; ${RM} -f drweb drwebd bases/* updates/*; ${MKDIR} updates + ${INSTALL} -dv -m 0750 ${DRWEB_PREFIX} + ${INSTALL} -dv -m 0750 ${PREFIX}/etc/drweb + ${INSTALL} -dv -m 0750 ${DRWEB_VARPREFIX} + ${RM} -rf ${WRKSRC}/usr/local/drweb/update.pl ${TAR} -cf - -C ${WRKSRC}/usr/local/drweb . | \ ${TAR} -xf - -C ${DRWEB_PREFIX} \ - --exclude "*.static" \ - --exclude "update/update.pl*" - ${TAR} -cf - -C ${WRKSRC}/var/drweb bases | \ - ${TAR} -xf - -C ${DRWEB_PREFIX} - ${CHMOD} 755 ${DRWEB_PREFIX}/bases ${DRWEB_PREFIX}/doc \ - ${DRWEB_PREFIX}/lib ${DRWEB_PREFIX}/updates - ${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 - ${SED} 's#%INSTALL%#${DRWEB_PREFIX}#g' \ - < ${WRKSRC}/usr/local/etc/drweb/drweb32.ini \ - > ${PREFIX}/drweb/drweb32.ini-distr - ${RM} -f ${PREFIX}/bin/drweb - if [ ! -f ${PREFIX}/drweb/drweb32.ini ] ; then \ - ${CP} ${PREFIX}/drweb/drweb32.ini-distr \ - ${PREFIX}/drweb/drweb32.ini; \ + --exclude "*.static" --exclude "doc" + ${TAR} -cf - -C ${WRKSRC}/var/drweb/ . | \ + ${TAR} -xf - -C ${DRWEB_VARPREFIX} + ${INSTALL_DATA} -m 0750 ${WRKSRC}/usr/local/etc/drweb/drweb32.ini \ + ${PREFIX}/etc/drweb/drweb32.ini-distr + if [ ! -f ${PREFIX}/etc/drweb/drweb32.ini ] ; then \ + ${CP} ${PREFIX}/etc/drweb/drweb32.ini-distr \ + ${PREFIX}/etc/drweb/drweb32.ini; \ fi - ${SED} 's#%INSTALL%#${DRWEB_PREFIX}#g' \ - < ${FILESDIR}/drweb.sh \ - > ${WRKDIR}/drweb - ${INSTALL_SCRIPT} ${WRKDIR}/drweb ${PREFIX}/bin - ${SED} 's#%INSTALL%#${DRWEB_PREFIX}#g' \ - < ${WRKSRC}/usr/local/etc/rc.d/00.drwebd.sh \ - > ${PREFIX}/etc/rc.d/00.drwebd.sh - ${CHMOD} 750 ${PREFIX}/etc/rc.d/00.drwebd.sh - ${INSTALL_DATA} ${WRKSRC}/usr/local/etc/drweb/email.ini \ - ${PREFIX}/drweb/email.ini-distr - if [ ! -f ${PREFIX}/drweb/email.ini ] ; then \ - ${CP} ${PREFIX}/drweb/email.ini-distr \ - ${PREFIX}/drweb/email.ini; \ + ${INSTALL_DATA} -m 0750 ${WRKSRC}/usr/local/etc/drweb/email.ini \ + ${PREFIX}/etc/drweb/email.ini-distr + if [ ! -f ${PREFIX}/etc/drweb/email.ini ] ; then \ + ${CP} ${PREFIX}/etc/drweb/email.ini-distr \ + ${PREFIX}/etc/drweb/email.ini; \ fi + ${INSTALL_SCRIPT} -m 0750 -b ${WRKSRC}/usr/local/etc/rc.d/00.drwebd.sh \ + ${PREFIX}/etc/rc.d/00.drwebd.sh post-install: - PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL +.if !defined(NOPORTDOCS) + ${MKDIR} ${DOCSDIR} + ${TAR} -cf - -C ${WRKSRC}/usr/local/drweb/doc . | \ + ${TAR} -xf - -C ${DOCSDIR} +.endif + ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL ${DRWEB_PREFIX} ${DRWEB_VARPREFIX} .include diff -ruN security/drweb_4.32.2/distinfo security/drweb/distinfo --- security/drweb_4.32.2/distinfo Thu Mar 3 03:08:13 2005 +++ security/drweb/distinfo Tue Oct 11 11:50:15 2005 @@ -1,4 +1,4 @@ -MD5 (drweb-4.32.2-freebsd49.tar.gz) = f9c901fecbd4829dab3766c79784ea1b -SIZE (drweb-4.32.2-freebsd49.tar.gz) = 2356661 -MD5 (drweb-4.32.2-freebsd53.tar.gz) = 03e928d696b6a5e42fdfbf966f5ab795 -SIZE (drweb-4.32.2-freebsd53.tar.gz) = 2768664 +MD5 (drweb-4.33-freebsd411.tar.gz) = 389a65d58c2563f86a7d3297d2bd4e50 +SIZE (drweb-4.33-freebsd411.tar.gz) = 3345689 +MD5 (drweb-4.33-freebsd54.tar.gz) = 0376869752653ee075af8a7044eaf57d +SIZE (drweb-4.33-freebsd54.tar.gz) = 3850792 diff -ruN security/drweb_4.32.2/pkg-install security/drweb/pkg-install --- security/drweb_4.32.2/pkg-install Mon Jan 17 21:46:04 2005 +++ security/drweb/pkg-install Tue Oct 11 13:56:53 2005 @@ -6,12 +6,12 @@ exit 0 fi +DRWEB_PREFIX="$3" +DRWEB_VARPREFIX="$4" USER=drweb GROUP=${USER} UID=426 GID=${UID} -BINOWN=root -BINGRP=wheel ex=0 if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then @@ -27,7 +27,7 @@ if ! pw usershow "${USER}" 2>/dev/null 1>&2; then if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \ - -s "/sbin/nologin" -d "/nonexistent" -c "Dr. Web Scanner" + -s "/sbin/nologin" -d "/nonexistent" -c "DrWeb Antivirus Software" then echo "" echo "Added user \"${USER}\"." @@ -41,15 +41,15 @@ echo "" echo "You may also add this lines to your /etc/syslog.conf:" echo "!drwebd" -echo "*.* /var/log/drwebd.log" +echo "*.* ${DRWEB_VARPREFIX}/drwebd.log" echo "" echo "You may also add this crontab entry to /etc/crontab" -echo "0 12 * * * ${BINOWN} ${PKG_PREFIX}/drweb/update/update.pl" +echo "0 12 * * * root ${DRWEB_PREFIX}/update/update.pl" echo "" [ "$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 0755 -o ${BINOWN} -g ${BINGRP} ${PKG_PREFIX}/drweb/updates +chown -R ${USER}:${GROUP} ${DRWEB_PREFIX} +chown -R ${USER}:${GROUP} ${DRWEB_VARPREFIX} +chmod 0750 ${DRWEB_VARPREFIX} exit 0 diff -ruN security/drweb_4.32.2/pkg-plist security/drweb/pkg-plist --- security/drweb_4.32.2/pkg-plist Fri Feb 11 03:11:05 2005 +++ security/drweb/pkg-plist Tue Oct 11 13:18:51 2005 @@ -1,37 +1,55 @@ -bin/drweb -drweb/bases/drw43201.vdb -drweb/bases/drwebase.vdb -drweb/doc/ChangeLog -drweb/doc/FAQ -drweb/doc/FAQ.rus -drweb/doc/readme.daemon -drweb/doc/readme.daemon.rus -drweb/doc/readme.license -drweb/doc/readme.license.rus -drweb/doc/readme.scanner -drweb/doc/readme.scanner.rus +@unexec if [ -f /var/drweb/run/drwebd.pid ] ; then %D/etc/rc.d/drwebd.sh stop ; fi drweb/drweb -@unexec if [ -f %D/drweb/drweb32.ini ] && cmp -s %D/drweb/drweb32.ini %D/drweb/drweb32.ini-distr; then rm -f %D/drweb/drweb32.ini; fi -drweb/drweb32.ini-distr -@exec if [ ! -f %D/drweb/drweb32.ini ] ; then cp -p %D/%F %B/drweb32.ini; fi drweb/drwebd drweb/drwebdc -@unexec if [ -f %D/drweb/email.ini ] && cmp -s %D/drweb/email.ini %D/drweb/email.ini-distr; then rm -f %D/drweb/email.ini; fi -drweb/email.ini-distr -@exec if [ ! -f %D/drweb/email.ini ] ; then cp -p %D/%F %B/email.ini; fi drweb/getkey.HOWTO drweb/getkey.rus.HOWTO drweb/lib/drweb32.dll -drweb/lib/russian.dwl -drweb/update/readme.update -drweb/update/readme.update.rus +drweb/lib/ru_daemon.dwl +drweb/lib/ru_scanner.dwl +drweb/read_signed drweb/update/update.pl +@unexec if [ -f %D/etc/drweb/drweb32.ini ] && cmp -s %D/etc/drweb/drweb32.ini %D/etc/drweb/drweb32.ini-distr; then rm -f %D/etc/drweb/drweb32.ini ; fi +@exec if [ ! -f %D/etc/drweb/drweb32.ini ] ; then cp -p %D/%F %B/drweb32.ini ; fi +etc/drweb/drweb32.ini-distr +@unexec if [ -f %D/etc/drweb/email.ini ] && cmp -s %D/etc/drweb/email.ini %D/etc/drweb/email.ini-distr; then rm -f %D/etc/drweb/email.ini ; fi +@exec if [ ! -f %D/etc/drweb/email.ini ] ; then cp -p %D/%F %B/email.ini ; fi +etc/drweb/email.ini-distr etc/rc.d/00.drwebd.sh -@dirrm drweb/updates +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/FAQ +%%PORTDOCS%%%%DOCSDIR%%/FAQ.rus +%%PORTDOCS%%%%DOCSDIR%%/daemon/readme.daemon +%%PORTDOCS%%%%DOCSDIR%%/daemon/readme.daemon.rus +%%PORTDOCS%%%%DOCSDIR%%/readme.eicar +%%PORTDOCS%%%%DOCSDIR%%/readme.eicar.rus +%%PORTDOCS%%%%DOCSDIR%%/readme.license +%%PORTDOCS%%%%DOCSDIR%%/readme.license.rus +%%PORTDOCS%%%%DOCSDIR%%/scanner/readme.scanner +%%PORTDOCS%%%%DOCSDIR%%/scanner/readme.scanner.rus +%%PORTDOCS%%%%DOCSDIR%%/update/readme.update +%%PORTDOCS%%%%DOCSDIR%%/update/readme.update.rus +@dirrm %%PORTDOCS%%%%DOCSDIR%%/update +@dirrm %%PORTDOCS%%%%DOCSDIR%%/scanner +@dirrm %%PORTDOCS%%%%DOCSDIR%%/daemon +@dirrm %%PORTDOCS%%%%DOCSDIR%% +@unexec rmdir %D/etc/drweb || 2>/dev/null @dirrm drweb/update -@dirrm drweb/run @dirrm drweb/lib -@dirrm drweb/infected -@dirrm drweb/doc -@dirrm drweb/bases @dirrm drweb +@cwd /var +drweb/bases/drw43300.vdb +drweb/bases/drw43301.vdb +drweb/bases/drw43302.vdb +drweb/bases/drwebase.vdb +drweb/bases/drwnasty.vdb +drweb/bases/drwrisky.vdb +drweb/bases/update.drl +@unexec rmdir /var/drweb/bases || 2>/dev/null +@unexec rmdir /var/drweb/infected || 2>/dev/null +@unexec rmdir /var/drweb/log || 2>/dev/null +@unexec rmdir /var/drweb/run || 2>/dev/null +@unexec rmdir /var/drweb/spool || 2>/dev/null +@unexec rmdir /var/drweb/updates || 2>/dev/null +@unexec rmdir /var/drweb || 2>/dev/null +@cwd %%PREFIX%% --- drweb_up_4.32.2_to_4.33 ends here --- >Release-Note: >Audit-Trail: >Unformatted: