From owner-freebsd-ports Thu May 23 15: 0:31 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1C32937B405 for ; Thu, 23 May 2002 15:00:07 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4NM07L05572; Thu, 23 May 2002 15:00:07 -0700 (PDT) (envelope-from gnats) Received: from utopia.leeym.com (utopia.leeym.com [61.218.64.93]) by hub.freebsd.org (Postfix) with ESMTP id D0C4237B403 for ; Thu, 23 May 2002 14:57:56 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by utopia.leeym.com (Postfix) with ESMTP id 005C73EA087 for ; Fri, 24 May 2002 05:57:53 +0800 (CST) Received: by utopia.leeym.com (Postfix, from userid 1000) id 5473B3EA07D; Fri, 24 May 2002 05:57:48 +0800 (CST) Message-Id: <20020523215748.5473B3EA07D@utopia.leeym.com> Date: Fri, 24 May 2002 05:57:48 +0800 (CST) From: Yen-Ming Lee Reply-To: Yen-Ming Lee To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/38469: update port: security/amavisd Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 38469 >Category: ports >Synopsis: update port: security/amavisd >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu May 23 15:00:07 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Yen-Ming Lee >Release: FreeBSD 4.6-RC i386 >Organization: >Environment: System: FreeBSD utopia.leeym.com 4.6-RC FreeBSD 4.6-RC #17: Sun May 19 21:21:47 CST 2002 root@utopia.leeym.com:/usr/obj/usr/src/sys/UTOPIA i386 >Description: 1. modify startup script: only one of amavisd and amavis-milter will be installed, not both. 2. change MASTER_SITES / add MASTER_SITE_SUBDIR 3. amavisd depends on Net::SMTP, not Net::Telnet 4. bump PORTREVISION >How-To-Repeat: >Fix: --- amavisd.diff begins here --- diff -ruN --exclude CVS /usr/ports/security/amavisd/Makefile amavisd/Makefile --- /usr/ports/security/amavisd/Makefile Mon May 20 05:24:20 2002 +++ amavisd/Makefile Fri May 24 01:28:23 2002 @@ -7,9 +7,10 @@ PORTNAME= amavisd PORTVERSION= 20020300 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security -MASTER_SITES= http://www.amavis.org/dist/perl/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= amavis DISTNAME= ${PORTNAME}-snapshot-${PORTVERSION} MAINTAINER= gslin@ccca.nctu.edu.tw @@ -29,7 +30,7 @@ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/IO/AtomicFile.pm:${PORTSDIR}/devel/p5-IO-stringy \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MIME/Body.pm:${PORTSDIR}/mail/p5-MIME-Tools \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools \ - ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/Telnet.pm:${PORTSDIR}/net/p5-Net-Telnet + ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net RUN_DEPENDS= ${BUILD_DEPENDS} GNU_CONFIGURE= yes diff -ruN --exclude CVS /usr/ports/security/amavisd/files/amavisd-milter.sh amavisd/files/amavisd-milter.sh --- /usr/ports/security/amavisd/files/amavisd-milter.sh Mon May 20 03:37:05 2002 +++ amavisd/files/amavisd-milter.sh Fri May 24 01:23:24 2002 @@ -7,7 +7,7 @@ case "$1" in start) - ( [ -x ${PREFIX}/sbin/amavisd ] && [ -x ${PREFIX}/sbin/amavis-milter ] ) || exit 1 + ( [ -x ${PREFIX}/sbin/amavisd ] || [ -x ${PREFIX}/sbin/amavis-milter ] ) || exit 1 AMAVISD=$(/bin/ps -xU %%AMAVISUSER%% | grep amavisd | awk '{ print $1 }') AMAVIS_MILTER=$(/bin/ps -xU %%AMAVISUSER%% | grep amavis-milter | awk '{ print $1 }') ( /bin/test "$AMAVISD" || /bin/test "$AMAVIS_MILTER" ) && \ @@ -17,7 +17,7 @@ su - %%AMAVISUSER%% -c ${PREFIX}/sbin/amavisd > /dev/null 2>&1 && echo -n ' amavisd-milter' ;; stop) - ( [ -x ${PREFIX}/sbin/amavisd ] && [ -x ${PREFIX}/sbin/amavis-milter ] ) || exit 1 + ( [ -x ${PREFIX}/sbin/amavisd ] || [ -x ${PREFIX}/sbin/amavis-milter ] ) || exit 1 AMAVISD=$(/bin/ps -xU %%AMAVISUSER%% | grep amavisd | awk '{ print $1 }') AMAVIS_MILTER=$(/bin/ps -xU %%AMAVISUSER%% | grep amavis-milter | awk '{ print $1 }') ( /bin/test "$AMAVISD" || /bin/test "$AMAVIS_MILTER" ) && \ diff -ruN --exclude CVS /usr/ports/security/amavisd/files/amavisd.sh amavisd/files/amavisd.sh --- /usr/ports/security/amavisd/files/amavisd.sh Mon May 20 05:24:20 2002 +++ amavisd/files/amavisd.sh Fri May 24 01:23:26 2002 @@ -7,7 +7,7 @@ case "$1" in start) - ( [ -x ${PREFIX}/sbin/amavisd ] && [ -x ${PREFIX}/sbin/amavis-milter ] ) || exit 1 + ( [ -x ${PREFIX}/sbin/amavisd ] || [ -x ${PREFIX}/sbin/amavis-milter ] ) || exit 1 AMAVISD=$(/bin/ps -xU %%AMAVISUSER%% | grep amavisd | awk '{ print $1 }') ( /bin/test "$AMAVISD" ) && \ su - %%AMAVISUSER%% -c "/bin/kill $AMAVISD" > /dev/null @@ -15,7 +15,7 @@ su - %%AMAVISUSER%% -c ${PREFIX}/sbin/amavisd > /dev/null 2>&1 && echo -n ' amavisd' ;; stop) - ( [ -x ${PREFIX}/sbin/amavisd ] && [ -x ${PREFIX}/sbin/amavis-milter ] ) || exit 1 + ( [ -x ${PREFIX}/sbin/amavisd ] || [ -x ${PREFIX}/sbin/amavis-milter ] ) || exit 1 AMAVISD=$(/bin/ps -xU %%AMAVISUSER%% | grep amavisd | awk '{ print $1 }') ( /bin/test "$AMAVISD") && \ su - %%AMAVISUSER%% -c "/bin/kill $AMAVISD" > /dev/null && echo -n ' amavisd' --- amavisd.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message