Date: Fri, 24 May 2002 02:21:02 +0400 (MSD) From: "Andrey V. Pevnev" <andrey@mgul.ac.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/38471: Update port: mail/mimedefang from 2.11 to 2.12 Message-ID: <200205232221.g4NML2Q2034575@ns1.mgul.ac.ru>
next in thread | raw e-mail | index | archive | help
>Number: 38471 >Category: ports >Synopsis: Update port: mail/mimedefang from 2.11 to 2.12 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu May 23 15:30:02 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Andrey V. Pevnev >Release: FreeBSD 4.5-RELEASE-p4 i386 >Organization: Moscow State Forestry University >Environment: System: FreeBSD ns1.mgul.ac.ru 4.5-RELEASE-p4 FreeBSD 4.5-RELEASE-p4 #0: Thu Apr 25 19:08:55 MSD 2002 andrey@ns1.mgul.ac.ru:/usr/obj/usr/src/sys/NS1 i386 >Description: 1. Update from 2.11 to 2.12 2. Some changes in startup/shutdown script and pkg-message >How-To-Repeat: >Fix: --- mimedefang.diff begins here --- diff -ruN mimedefang.bak/Makefile mimedefang/Makefile --- mimedefang.bak/Makefile Thu May 23 23:20:58 2002 +++ mimedefang/Makefile Fri May 24 01:48:36 2002 @@ -6,7 +6,7 @@ # PORTNAME= mimedefang -PORTVERSION= 2.11 +PORTVERSION= 2.12 CATEGORIES= mail MASTER_SITES= http://www.roaringpenguin.com/mimedefang/ @@ -33,7 +33,7 @@ .endif post-install: - ${INSTALL} -m 755 ${FILESDIR}/mimedefang.sh ${PREFIX}/etc/rc.d/mimedefang.sh + ${INSTALL_SCRIPT} ${FILESDIR}/mimedefang.sh ${PREFIX}/etc/rc.d/mimedefang.sh .if !defined(NOPORTDOCS) ${MKDIR} ${EXAMPLESDIR} ${MKDIR} ${DOCSDIR} diff -ruN mimedefang.bak/distinfo mimedefang/distinfo --- mimedefang.bak/distinfo Thu May 23 23:20:58 2002 +++ mimedefang/distinfo Fri May 24 01:48:41 2002 @@ -1 +1 @@ -MD5 (mimedefang-2.11.tar.gz) = 1b4b37bcf536336ef6cbebd2f631f327 +MD5 (mimedefang-2.12.tar.gz) = 91c717239324d18583fd2f23bd2b3be6 diff -ruN mimedefang.bak/files/mimedefang.sh mimedefang/files/mimedefang.sh --- mimedefang.bak/files/mimedefang.sh Thu May 23 23:20:58 2002 +++ mimedefang/files/mimedefang.sh Fri May 24 02:04:25 2002 @@ -1,6 +1,6 @@ #!/bin/sh - # -# initialization/shutdown script for DrWeb daemon and DrWeb mail filter +# initialization/shutdown script for MIMEDefang mail filter if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then echo "$0: Cannot determine the PREFIX" >&2 @@ -30,14 +30,13 @@ MULTIPLEX=${PREFIX}/bin/mimedefang-multiplexor # MIMEDefang socket -SOCK=${SPOOLDIR}/mimedefang.sock - +SOCK=/var/run/mimedefang.sock # MIMEDefang-multiplexor socket -MXSOCK=${SPOOLDIR}/mdefang-mx.sock - +MXSOCK=/var/run/mdefang-mx.sock # PID file location -PIDFILE=${SPOOLDIR}/mimedefang.pid - +PIDFILE=/var/run/mimedefang.pid +# Multiplexor PID file location +MXPIDFILE=/var/run/mdefang-mx.pid # MIMEDefang owner USER=mailnull @@ -47,16 +46,15 @@ # See how we were called. case "$1" in start) - # Clean spool directory - su -m ${USER} -c "rm -f ${PIDFILE} ${SOCK} ${MXSOCK}" - # Start daemons. + # Remove socket if it exists + rm -f ${SOCK} # Start multiplexor - su -m ${USER} -c "$MULTIPLEX -x $MAX_SLAVES -m $MIN_SLAVES -b $BUSY_TIMEOUT -i $IDLE_TIMEOUT $DO_LOGGING $STATS_LOG $FLUSH_STATS -s ${MXSOCK}" + $MULTIPLEX -U ${USER} -x $MAX_SLAVES -m $MIN_SLAVES -b $BUSY_TIMEOUT -i $IDLE_TIMEOUT $DO_LOGGING $STATS_LOG $FLUSH_STATS -s ${MXSOCK} -p ${MXPIDFILE} RETVAL=$? [ $RETVAL -ne 0 ] && exit 1 echo -n " mimedefang-multiplexor" - su -m ${USER} -c "$MIMEDEFANG -m ${MXSOCK} -p ${SOCK} -P ${PIDFILE}" + $MIMEDEFANG -U ${USER} -m ${MXSOCK} -p ${SOCK} -P ${PIDFILE} RETVAL=$? [ $RETVAL -ne 0 ] && exit 1 echo -n " mimedefang" @@ -65,8 +63,7 @@ # Stop daemons. kill `cat ${PIDFILE}` echo -n " mimedefang" - kill `ps ax | grep mimedefang-multiplexor | grep -v grep | grep -v sh | awk '{print $1}'` - su -m ${USER} -c "rm -f ${PIDFILE} ${SOCK} ${MXSOCK}" + kill `cat ${MXPIDFILE}` echo -n " mimedefang-multiplexor" ;; restart) diff -ruN mimedefang.bak/pkg-message mimedefang/pkg-message --- mimedefang.bak/pkg-message Thu May 23 23:20:58 2002 +++ mimedefang/pkg-message Fri May 24 01:59:25 2002 @@ -1,5 +1,11 @@ -To finish installation please reconfigure sendmail to use - MIMEDefang filter, for example add this lines to your sendmail.mc +To finish installation please follow these steps: - MAIL_FILTER(`mimedefang', `S=local:/var/spool/MIMEDefang/mimedefang.sock, F=T, T=C:15m;S:4m;R:4m;E:10m')dnl - define(`confINPUT_MAIL_FILTERS', `mimedefang')dnl +1. Edit /etc/mail/mimedefang-filter + +2. Reconfigure sendmail to use MIMEDefang, for example add this lines to + your sendmail.mc: + + MAIL_FILTER(`mimedefang', `S=local:/var/run/mimedefang.sock, F=T, T=C:15m;S:4m;R:4m;E:10m')dnl + define(`confINPUT_MAIL_FILTERS', `mimedefang')dnl + + rebuild sendmail.cf and install it. diff -ruN mimedefang.bak/pkg-plist mimedefang/pkg-plist --- mimedefang.bak/pkg-plist Thu May 23 23:20:58 2002 +++ mimedefang/pkg-plist Fri May 24 01:48:17 2002 @@ -5,6 +5,7 @@ %%PORTDOCS%%share/doc/mimedefang/README %%PORTDOCS%%share/doc/mimedefang/README.ANOMY %%PORTDOCS%%share/doc/mimedefang/README.SPAMASSASSIN +%%PORTDOCS%%share/doc/mimedefang/README.NONROOT %%PORTDOCS%%share/examples/mimedefang/suggested-minimum-filter-for-windows-clients %%PORTDOCS%%share/examples/mimedefang/README %%PORTDOCS%%share/examples/mimedefang/redhat-logrotate-file --- mimedefang.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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200205232221.g4NML2Q2034575>