Date: Mon, 20 May 2002 00:49:36 +0800 (CST) From: Gea-Suan Lin <gslin@infomath.math.nctu.edu.tw> To: FreeBSD-gnats-submit@FreeBSD.org Cc: gslin@infomath.math.nctu.edu.tw Subject: ports/38297: Maintainer Update port: security/amavisd Message-ID: <20020519164936.4597F3D99@infomath.math.nctu.edu.tw>
next in thread | raw e-mail | index | archive | help
>Number: 38297 >Category: ports >Synopsis: Maintainer Update port: security/amavisd >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun May 19 09:50:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Gea-Suan Lin >Release: FreeBSD 4.5-RELEASE-p4 i386 >Organization: >Environment: System: FreeBSD InfoMath.Math.NCTU.edu.tw 4.5-RELEASE-p4 FreeBSD 4.5-RELEASE-p4 #7: Tue Apr 23 04:15:27 CST 2002 root@InfoMath.Math.NCTU.edu.tw:/home/obj/usr/src/sys/InFoMath i386 >Description: Thanks for Martin Matuska <matuska@wu-wien.ac.at> :) He sent me a patch support milter and fixed the startup script. >How-To-Repeat: >Fix: diff -ruN /usr/ports/security/amavisd/Makefile amavisd/Makefile --- /usr/ports/security/amavisd/Makefile Wed May 15 23:04:51 2002 +++ amavisd/Makefile Sun May 19 18:29:01 2002 @@ -7,7 +7,7 @@ PORTNAME= amavisd PORTVERSION= 20020300 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= http://www.amavis.org/dist/perl/ DISTNAME= ${PORTNAME}-snapshot-${PORTVERSION} @@ -39,6 +39,8 @@ CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc --with-amavisuser=${AMAVISUSER}:${AMAVISGROUP} +STARTSCRIPT= amavisd.sh + .if defined(WITH_POSTFIX) CONFIGURE_ARGS+= --enable-postfix MTA?= postfix @@ -47,19 +49,24 @@ CONFIGURE_ARGS+= --enable-postfix MTA?= postfix RUN_DEPENDS+= ${LOCALBASE}/libexec/postfix/smtpd:${PORTSDIR}/mail/postfix-current +.elif defined(WITH_MILTER) +CONFIGURE_ARGS+= --enable-milter +MTA?= milter +PLIST= ${PKGDIR}/pkg-plist.milter +STARTSCRIPT= amavisd-milter.sh .else CONFIGURE_ARGS+= --enable-sendmail MTA?= sendmail .endif post-patch: - @${SED} 's,%%AMAVISUSER%%,${AMAVISUSER},g' ${FILESDIR}/amavisd.sh > ${WRKSRC}/amavisd.sh + @${SED} 's,%%AMAVISUSER%%,${AMAVISUSER},g' ${FILESDIR}/${STARTSCRIPT} > ${WRKSRC}/${STARTSCRIPT} pre-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${AMAVISUSER} ${AMAVISGROUP} post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/amavisd.sh ${PREFIX}/etc/rc.d + ${INSTALL_SCRIPT} ${WRKSRC}/${STARTSCRIPT} ${PREFIX}/etc/rc.d .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for FILE in FAQ INSTALL README README.exim README.milter README.postfix README.qmail README.scanners README.sendmail doc/amavis.html doc/amavis.m4 doc/amavis.png doc/amavis.txt diff -ruN /usr/ports/security/amavisd/files/amavisd-milter.sh amavisd/files/amavisd-milter.sh --- /usr/ports/security/amavisd/files/amavisd-milter.sh Thu Jan 1 08:00:00 1970 +++ amavisd/files/amavisd-milter.sh Mon May 20 00:45:46 2002 @@ -0,0 +1,31 @@ +#!/bin/sh + +if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then + echo "$0: Cannot determine the PREFIX" >&2 + exit 1 +fi + +case "$1" in +start) + ( [ -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" ) && \ + su - %%AMAVISUSER%% -c "/bin/kill $AMAVISD $AMAVIS_MILTER" > /dev/null + rm -rf /var/amavis/amavis*.sock + su - %%AMAVISUSER%% -c "${PREFIX}/sbin/amavis-milter -D -p /var/amavis/amavis-milter.sock" > /dev/null + 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 + 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" ) && \ + su - %%AMAVISUSER%% -c "/bin/kill $AMAVISD $AMAVIS_MILTER" > /dev/null && echo -n ' amavisd-milter' + ;; +*) + echo "Usage: `basename $0` {start|stop}" >&2 + ;; +esac + +exit 0 diff -ruN /usr/ports/security/amavisd/files/amavisd.sh amavisd/files/amavisd.sh --- /usr/ports/security/amavisd/files/amavisd.sh Wed May 15 21:19:02 2002 +++ amavisd/files/amavisd.sh Mon May 20 00:45:37 2002 @@ -7,10 +7,18 @@ case "$1" in start) - [ -x ${PREFIX}/sbin/amavisd ] && su - %%AMAVISUSER%% -c ${PREFIX}/sbin/amavisd > /dev/null 2>&1 && echo -n ' amavisd' + ( [ -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 + rm -rf /var/amavis/amavis*.sock + su - %%AMAVISUSER%% -c ${PREFIX}/sbin/amavisd > /dev/null 2>&1 && echo -n ' amavisd' ;; stop) - echo -n ' amavisd' + ( [ -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' ;; *) echo "Usage: `basename $0` {start|stop}" >&2 diff -ruN /usr/ports/security/amavisd/pkg-plist.milter amavisd/pkg-plist.milter --- /usr/ports/security/amavisd/pkg-plist.milter Thu Jan 1 08:00:00 1970 +++ amavisd/pkg-plist.milter Sun May 19 18:30:37 2002 @@ -0,0 +1,18 @@ +%%PORTDOCS%%share/doc/amavisd/FAQ +%%PORTDOCS%%share/doc/amavisd/INSTALL +%%PORTDOCS%%share/doc/amavisd/README +%%PORTDOCS%%share/doc/amavisd/README.exim +%%PORTDOCS%%share/doc/amavisd/README.milter +%%PORTDOCS%%share/doc/amavisd/README.postfix +%%PORTDOCS%%share/doc/amavisd/README.qmail +%%PORTDOCS%%share/doc/amavisd/README.scanners +%%PORTDOCS%%share/doc/amavisd/README.sendmail +%%PORTDOCS%%share/doc/amavisd/amavis.html +%%PORTDOCS%%share/doc/amavisd/amavis.m4 +%%PORTDOCS%%share/doc/amavisd/amavis.png +%%PORTDOCS%%share/doc/amavisd/amavis.txt +%%PORTDOCS%%@dirrm share/doc/amavisd +etc/amavisd.conf +etc/rc.d/amavisd-milter.sh +sbin/amavis-milter +sbin/amavisd >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020519164936.4597F3D99>