Date: Sun, 19 Jun 2005 19:38:38 +0200 (CEST) From: Petr Rehor <prehor@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: blaz@si.FreeBSD.org Subject: ports/82423: [PATCH] security/amavisd-new: several improvements Message-ID: <200506191738.j5JHccpa020885@charon.rx.cz> Resent-Message-ID: <200506191740.j5JHe8lF056335@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 82423 >Category: ports >Synopsis: [PATCH] security/amavisd-new: several improvements >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: Sun Jun 19 17:40:08 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Petr Rehor >Release: FreeBSD 5.3-RELEASE-p2 i386 >Organization: >Environment: System: FreeBSD charon.rx.cz 5.3-RELEASE-p2 FreeBSD 5.3-RELEASE-p2 #0: Sun Dec 5 01:31:43 UTC 2004 root@marvin.rx.cz:/usr/obj/usr/src/sys/GENERIC i386 >Description: [DESCRIBE CHANGES] - Bump PORTREVISION to 1 - Install new command amavisd-agent - Use USE_RCORDER to install rc.d scripts to /etc/rc.d on 5.x (requires rename amavisd.sh.tmpl and amavis-milter.sh.tmpl to amavisd.sh.in and amavis-milter.sh.in) - Improve rc.d/amavisd.sh and rc.d/amavis-milter.sh scripts (set defaults before eating rc.conf, fix bug in BEFORE keyword in rc.d/amavis-milter.sh) - Stop amamvisd and amavis-milter when package is deinstalling or upgrading - Use SUB_FILES for pkg-* files building (requires rename INSTAL.tmpl, DEINSTALL.tmpl and MESSAGE.tmpl to pkg-install.in, pkg-deinstall.in and pkg-messages.in) - Add WITH_MILTER options knob (when not selected, sbin/amavis-milter and rc.d/amavis-milter.sh are not installed) >How-To-Repeat: >Fix: --- amavisd-new.diff begins here --- diff -urN /usr/ports/security/amavisd-new/Makefile ./Makefile --- /usr/ports/security/amavisd-new/Makefile Mon Jun 6 03:30:20 2005 +++ ./Makefile Sun Jun 19 18:54:56 2005 @@ -9,6 +9,7 @@ PORTNAME= amavisd-new PORTVERSION= 2.3.1 PORTEPOCH= 1 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://www.ijs.si/software/amavisd/ \ http://mirrors.catpipe.net/amavisd-new/ \ @@ -39,11 +40,7 @@ ${LOCALBASE}/bin/rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio USE_PERL5_RUN= yes -USE_RC_SUBR= yes - -PKGINSTALL= ${WRKDIR}/INSTALL -PKGDEINSTALL= ${WRKDIR}/DEINSTALL -PKGMESSAGE= ${WRKDIR}/MESSAGE +USE_RCORDER= amavisd.sh AMAVISUSER?= vscan AMAVISGROUP?= vscan @@ -54,17 +51,35 @@ OPTIONS= MYSQL "MySQL support" off \ PGSQL "PgSQL support" off \ - LDAP "LDAP support" off + LDAP "LDAP support" off \ + MILTER "sendmail milter support" on + +SUB_FILES= pkg-install pkg-deinstall pkg-message + +SUB_LIST= AMAVISUSER=${AMAVISUSER} \ + AMAVISGROUP=${AMAVISGROUP} \ + AMAVISDIR=${AMAVISDIR} \ + AMAVISQUARANTINE=${AMAVISQUARANTINE} \ + DOCSDIR=${DOCSDIR} .include <bsd.port.pre.mk> .if !exists(/usr/lib/libmilter.a) && !exists(${PREFIX}/lib/libmilter.a) +AMAVIS_NOAMAVIS="@comment " +.endif + +.if defined(WITH_MILTER) && !defined(AMAVIS_NOAMAVIS) +USE_RCORDER+= amavis-milter.sh +.else AMAVIS_NOMILTER="@comment " .endif -PLIST_SUB+= AMAVIS_NOMILTER=${AMAVIS_NOMILTER} +PLIST_SUB+= AMAVIS_NOMILTER=${AMAVIS_NOMILTER} \ + AMAVIS_NOAMAVIS=${AMAVIS_NOAMAVIS} \ + RC_DIR=${RC_DIR} \ + RC_SUFX=${RC_SUFX} -.if defined(AMAVIS_NOMILTER) +.if defined(AMAVIS_NOAMAVIS) do-build: @${ECHO} libmilter not available, not building amavis-milter and amavis .else @@ -74,13 +89,7 @@ BUILD_WRKSRC= ${WRKSRC}/helper-progs .endif -SED_SCRIPT= -e 's,%%AMAVISUSER%%,${AMAVISUSER},g' \ - -e 's,%%AMAVISGROUP%%,${AMAVISGROUP},g' \ - -e 's,%%AMAVISDIR%%,${AMAVISDIR},g' \ - -e 's,%%AMAVISQUARANTINE%%,${AMAVISQUARANTINE},g' \ - -e 's,%%DOCSDIR%%,${DOCSDIR},g' \ - -e 's,%%PREFIX%%,${PREFIX},g' \ - -e 's,%%RC_SUBR%%,${RC_SUBR},g' +SED_SCRIPT= ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} .if defined(WITH_MYSQL) RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql @@ -94,11 +103,8 @@ RUN_DEPENDS+= ${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap .endif -pre-build: - for f in amavisd.sh amavis-milter.sh INSTALL DEINSTALL MESSAGE; do \ - ${SED} ${SED_SCRIPT} < ${FILESDIR}/$${f}.tmpl > ${WRKDIR}/$${f}; \ - done - for f in amavisd.conf amavisd.conf-sample amavisd amavisd-nanny; do \ +post-patch: + @for f in amavisd.conf amavisd.conf-sample amavisd amavisd-agent amavisd-nanny; do \ ${SED} ${SED_SCRIPT} < ${WRKSRC}/$${f} > ${WRKDIR}/$${f}; \ done @@ -106,12 +112,14 @@ @${SH} ${PKGINSTALL} ${DISTNAME} PRE-INSTALL do-install: -.if !defined(AMAVIS_NOMILTER) +.if !defined(AMAVIS_NOAMAVIS) ${INSTALL_PROGRAM} ${WRKSRC}/helper-progs/amavis ${PREFIX}/sbin +.endif +.if !defined(AMAVIS_NOMILTER) ${INSTALL_PROGRAM} ${WRKSRC}/helper-progs/amavis-milter ${PREFIX}/sbin - ${INSTALL_SCRIPT} ${WRKDIR}/amavis-milter.sh ${PREFIX}/etc/rc.d .endif ${INSTALL_SCRIPT} ${WRKDIR}/amavisd ${PREFIX}/sbin + ${INSTALL_SCRIPT} ${WRKDIR}/amavisd-agent ${PREFIX}/sbin ${INSTALL_SCRIPT} ${WRKDIR}/amavisd-nanny ${PREFIX}/sbin ${INSTALL_SCRIPT} ${WRKDIR}/amavisd.conf ${PREFIX}/etc/amavisd.conf-dist .if !exists(${PREFIX}/etc/amavisd.conf) @@ -119,7 +127,6 @@ .endif ${INSTALL_SCRIPT} ${WRKDIR}/amavisd.conf-sample ${PREFIX}/etc/amavisd.conf-sample ${INSTALL_SCRIPT} ${WRKSRC}/amavisd.conf-default ${PREFIX}/etc/amavisd.conf-default - ${INSTALL_SCRIPT} ${WRKDIR}/amavisd.sh ${PREFIX}/etc/rc.d .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for FILE in AAAREADME.first INSTALL LDAP.schema LICENSE RELEASE_NOTES README_FILES/* diff -urN /usr/ports/security/amavisd-new/files/DEINSTALL.tmpl ./files/DEINSTALL.tmpl --- /usr/ports/security/amavisd-new/files/DEINSTALL.tmpl Sun Apr 20 12:02:44 2003 +++ ./files/DEINSTALL.tmpl Thu Jan 1 01:00:00 1970 @@ -1,28 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: ports/security/amavisd-new/files/DEINSTALL.tmpl,v 1.3 2003/04/20 10:02:44 leeym Exp $ -# - -USER=%%AMAVISUSER%% -GROUP=%%AMAVISGROUP%% -DIR=%%AMAVISDIR%% -QUARANTINE=%%AMAVISQUARANTINE%% - -if [ "$2" = "POST-DEINSTALL" ]; then - - if /usr/sbin/pw group show "${GROUP}" 2>&1 >/dev/null; then - echo "You should manually remove the \"${GROUP}\" group." - fi - - if /usr/sbin/pw user show "${USER}" 2>&1 >/dev/null; then - echo "You should manually remove the \"${USER}\" user." - fi - - if [ -e ${DIR} ]; then - echo "You should manually remove the \"${DIR}\" directory." - fi - - if [ -e ${QUARANTINE} ]; then - echo "You should manually remove the \"${QUARANTINE}\" directory." - fi -fi diff -urN /usr/ports/security/amavisd-new/files/INSTALL.tmpl ./files/INSTALL.tmpl --- /usr/ports/security/amavisd-new/files/INSTALL.tmpl Tue Feb 15 03:18:45 2005 +++ ./files/INSTALL.tmpl Thu Jan 1 01:00:00 1970 @@ -1,51 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: ports/security/amavisd-new/files/INSTALL.tmpl,v 1.6 2005/02/14 03:51:45 leeym Exp $ -# - -USER=%%AMAVISUSER%% -GROUP=%%AMAVISGROUP%% -DIR=%%AMAVISDIR%% -QUARANTINE=%%AMAVISQUARANTINE%% - -if [ "$2" = "PRE-INSTALL" ]; then - - if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then - echo "You already have a group \"${GROUP}\", so I will use it." - else - if /usr/sbin/pw groupadd ${GROUP} -h - -g 110 - then - echo "Added group \"${GROUP}\"." - else - echo "Adding group \"${GROUP}\" failed..." - echo "Please create it, and try again." - exit 1 - fi - fi - - if /usr/sbin/pw user show "${USER}" 2>/dev/null; then - echo "You already have a user \"${USER}\", so I will use it." - else - if /usr/sbin/pw useradd ${USER} -g ${GROUP} -h - \ - -d ${DIR} \ - -s /bin/sh \ - -c "Scanning Virus Account" \ - -u 110 - then - echo "Added user \"${USER}\"." - else - echo "Adding user \"${USER}\" failed..." - echo "Please create it, and try again." - exit 1 - fi - fi - - /usr/bin/install -o ${USER} -g ${GROUP} -m 750 -d ${DIR} - echo "Created \"${DIR}\" directory." - /usr/bin/install -o ${USER} -g ${GROUP} -m 750 -d ${DIR}/db - echo "Created \"${DIR}/db\" directory." - /usr/bin/install -o ${USER} -g ${GROUP} -m 750 -d ${DIR}/tmp - echo "Created \"${DIR}/tmp\" directory." - /usr/bin/install -o ${USER} -g ${GROUP} -m 750 -d ${QUARANTINE} - echo "Created \"${QUARANTINE}\" directory." -fi diff -urN /usr/ports/security/amavisd-new/files/MESSAGE.tmpl ./files/MESSAGE.tmpl --- /usr/ports/security/amavisd-new/files/MESSAGE.tmpl Thu Aug 12 00:45:57 2004 +++ ./files/MESSAGE.tmpl Thu Jan 1 01:00:00 1970 @@ -1,25 +0,0 @@ - -******************************************************************* - To use amavisd-new, you need to install at least one virus scanner. - The following virus scanners are available in the FreeBSD ports - collection: - - /usr/ports/security/vscan McAfee VirusScan - /usr/ports/security/clamav Clam Antivirus - /usr/ports/security/f-prot F-Prot Antivirus - /usr/ports/security/drweb DrWeb antivirus suite - - Enable amavisd-new in /etc/rc.conf with the following line: - - amavisd_enable="YES" - - If you want to use the amavis sendmail milter interface, - you need the following additional line in /etc/rc.conf - - amavis_milter_enable="YES" - - Configuration templates are available in %%PREFIX%%/etc - as amavisd.conf-dist, amavisd.conf-sample and amavisd.conf-default. - Documentation is available in %%DOCSDIR%%. -******************************************************************* - diff -urN /usr/ports/security/amavisd-new/files/amavis-milter.sh.in ./files/amavis-milter.sh.in --- /usr/ports/security/amavisd-new/files/amavis-milter.sh.in Thu Jan 1 01:00:00 1970 +++ ./files/amavis-milter.sh.in Sun Jun 19 18:23:50 2005 @@ -0,0 +1,31 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: amavis_milter +# REQUIRE: amavisd +# BEFORE: mail +# KEYWORD: FreeBSD shutdown + +# +# Add the following lines to /etc/rc.conf to enable amavis-milter: +# +#amavis_milter_enable="YES" +# + +# Set defaults +amavis_milter_enable="NO" +amavis_milter_flags="-D -p %%AMAVISDIR%%/amavis-milter.sock" +amavis_milter_user="%%AMAVISUSER%%" + +. %%RC_SUBR%% + +name=amavis_milter +rcvar=`set_rcvar` + +command=%%PREFIX%%/sbin/amavis-milter +required_files=%%PREFIX%%/etc/amavisd.conf + +load_rc_config $name +run_rc_command "$1" diff -urN /usr/ports/security/amavisd-new/files/amavis-milter.sh.tmpl ./files/amavis-milter.sh.tmpl --- /usr/ports/security/amavisd-new/files/amavis-milter.sh.tmpl Thu Nov 20 12:00:19 2003 +++ ./files/amavis-milter.sh.tmpl Thu Jan 1 01:00:00 1970 @@ -1,34 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: ports/security/amavisd-new/files/amavis-milter.sh.tmpl,v 1.1 2003/11/20 11:00:19 jeh Exp $ -# - -# PROVIDE: amavis_milter -# REQUIRE: amavisd -# BEFORE: amavisd -# KEYWORD: FreeBSD shutdown - -# -# Add the following lines to /etc/rc.conf to enable amavis-milter: -# -#amavis_milter_enable="YES" -# - -. %%RC_SUBR%% - -name=amavis_milter -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/amavis-milter - -amavis_milter_user=%%AMAVISUSER%% - -required_files=%%PREFIX%%/etc/amavisd.conf - -# set defaults - -amavis_milter_enable=${amavis_milter_enable:-"NO"} -amavis_milter_flags=${amavis_milter_flags:-"-D -p %%AMAVISDIR%%/amavis-milter.sock"} - -load_rc_config $name -run_rc_command "$1" diff -urN /usr/ports/security/amavisd-new/files/amavisd.sh.in ./files/amavisd.sh.in --- /usr/ports/security/amavisd-new/files/amavisd.sh.in Thu Jan 1 01:00:00 1970 +++ ./files/amavisd.sh.in Sun Jun 19 18:21:10 2005 @@ -0,0 +1,38 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: amavisd +# REQUIRE: LOGIN +# BEFORE: mail +# KEYWORD: FreeBSD shutdown + +# +# Add the following lines to /etc/rc.conf to enable amavisd: +# +#amavisd_enable="YES" +# + +# Set defaults +amavisd_enable="NO" +amavisd_flags="-u %%AMAVISUSER%%" + +. %%RC_SUBR%% + +name=amavisd +rcvar=`set_rcvar` + +command=%%PREFIX%%/sbin/amavisd > /dev/null 2>&1 +pidfile=%%AMAVISDIR%%/amavisd.pid +required_files=%%PREFIX%%/etc/amavisd.conf + +stop_postcmd=stop_postcmd + +stop_postcmd() +{ + rm -f $pidfile +} + +load_rc_config $name +run_rc_command "$1" diff -urN /usr/ports/security/amavisd-new/files/amavisd.sh.tmpl ./files/amavisd.sh.tmpl --- /usr/ports/security/amavisd-new/files/amavisd.sh.tmpl Sun Jul 18 12:05:50 2004 +++ ./files/amavisd.sh.tmpl Thu Jan 1 01:00:00 1970 @@ -1,42 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: ports/security/amavisd-new/files/amavisd.sh.tmpl,v 1.7 2004/07/18 10:05:50 vanilla Exp $ -# - -# PROVIDE: amavisd -# REQUIRE: LOGIN -# BEFORE: mail -# KEYWORD: FreeBSD shutdown - -# -# Add the following lines to /etc/rc.conf to enable amavisd: -# -#amavisd_enable="YES" -# - -. %%RC_SUBR%% - -name=amavisd -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/amavisd > /dev/null 2>&1 - -amavisd_flags="-u %%AMAVISUSER%%" - -pidfile=%%AMAVISDIR%%/amavisd.pid -required_files=%%PREFIX%%/etc/amavisd.conf - -stop_postcmd=stop_postcmd - -stop_postcmd() -{ - rm -f $pidfile -} - -# set defaults - -amavisd_enable=${amavisd_enable:-"NO"} -amavisd_flags=${amavisd_flags:-""} - -load_rc_config $name -run_rc_command "$1" diff -urN /usr/ports/security/amavisd-new/files/patch-amavisd-agent ./files/patch-amavisd-agent --- /usr/ports/security/amavisd-new/files/patch-amavisd-agent Thu Jan 1 01:00:00 1970 +++ ./files/patch-amavisd-agent Sun Jun 19 18:28:27 2005 @@ -0,0 +1,11 @@ +--- amavisd-agent.orig Sun Jun 19 18:26:43 2005 ++++ amavisd-agent Sun Jun 19 18:28:04 2005 +@@ -107,7 +107,7 @@ + # main program starts here + $SIG{INT} = sub { die "\n" }; # do the END code block + my($env) = BerkeleyDB::Env->new( +- '-Home'=>'/var/amavis/db', '-Flags'=> DB_INIT_CDB | DB_INIT_MPOOL); ++ '-Home'=>'%%AMAVISDIR%%/db', '-Flags'=> DB_INIT_CDB | DB_INIT_MPOOL); + defined $env or die "BDB no env: $BerkeleyDB::Error $!"; + my($db) = BerkeleyDB::Hash->new( + '-Filename'=>'snmp.db', '-Flags'=>DB_RDONLY, '-Env'=>$env ); diff -urN /usr/ports/security/amavisd-new/files/pkg-deinstall.in ./files/pkg-deinstall.in --- /usr/ports/security/amavisd-new/files/pkg-deinstall.in Thu Jan 1 01:00:00 1970 +++ ./files/pkg-deinstall.in Sun Jun 19 18:15:24 2005 @@ -0,0 +1,28 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +USER=%%AMAVISUSER%% +GROUP=%%AMAVISGROUP%% +DIR=%%AMAVISDIR%% +QUARANTINE=%%AMAVISQUARANTINE%% + +if [ "$2" = "POST-DEINSTALL" ]; then + + if /usr/sbin/pw group show "${GROUP}" 2>&1 >/dev/null; then + echo "You should manually remove the \"${GROUP}\" group." + fi + + if /usr/sbin/pw user show "${USER}" 2>&1 >/dev/null; then + echo "You should manually remove the \"${USER}\" user." + fi + + if [ -e ${DIR} ]; then + echo "You should manually remove the \"${DIR}\" directory." + fi + + if [ -e ${QUARANTINE} ]; then + echo "You should manually remove the \"${QUARANTINE}\" directory." + fi +fi diff -urN /usr/ports/security/amavisd-new/files/pkg-install.in ./files/pkg-install.in --- /usr/ports/security/amavisd-new/files/pkg-install.in Thu Jan 1 01:00:00 1970 +++ ./files/pkg-install.in Sun Jun 19 18:15:40 2005 @@ -0,0 +1,51 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +USER=%%AMAVISUSER%% +GROUP=%%AMAVISGROUP%% +DIR=%%AMAVISDIR%% +QUARANTINE=%%AMAVISQUARANTINE%% + +if [ "$2" = "PRE-INSTALL" ]; then + + if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then + echo "You already have a group \"${GROUP}\", so I will use it." + else + if /usr/sbin/pw groupadd ${GROUP} -h - -g 110 + then + echo "Added group \"${GROUP}\"." + else + echo "Adding group \"${GROUP}\" failed..." + echo "Please create it, and try again." + exit 1 + fi + fi + + if /usr/sbin/pw user show "${USER}" 2>/dev/null; then + echo "You already have a user \"${USER}\", so I will use it." + else + if /usr/sbin/pw useradd ${USER} -g ${GROUP} -h - \ + -d ${DIR} \ + -s /bin/sh \ + -c "Scanning Virus Account" \ + -u 110 + then + echo "Added user \"${USER}\"." + else + echo "Adding user \"${USER}\" failed..." + echo "Please create it, and try again." + exit 1 + fi + fi + + /usr/bin/install -o ${USER} -g ${GROUP} -m 750 -d ${DIR} + echo "Created \"${DIR}\" directory." + /usr/bin/install -o ${USER} -g ${GROUP} -m 750 -d ${DIR}/db + echo "Created \"${DIR}/db\" directory." + /usr/bin/install -o ${USER} -g ${GROUP} -m 750 -d ${DIR}/tmp + echo "Created \"${DIR}/tmp\" directory." + /usr/bin/install -o ${USER} -g ${GROUP} -m 750 -d ${QUARANTINE} + echo "Created \"${QUARANTINE}\" directory." +fi diff -urN /usr/ports/security/amavisd-new/files/pkg-message.in ./files/pkg-message.in --- /usr/ports/security/amavisd-new/files/pkg-message.in Thu Jan 1 01:00:00 1970 +++ ./files/pkg-message.in Thu Aug 12 00:45:57 2004 @@ -0,0 +1,25 @@ + +******************************************************************* + To use amavisd-new, you need to install at least one virus scanner. + The following virus scanners are available in the FreeBSD ports + collection: + + /usr/ports/security/vscan McAfee VirusScan + /usr/ports/security/clamav Clam Antivirus + /usr/ports/security/f-prot F-Prot Antivirus + /usr/ports/security/drweb DrWeb antivirus suite + + Enable amavisd-new in /etc/rc.conf with the following line: + + amavisd_enable="YES" + + If you want to use the amavis sendmail milter interface, + you need the following additional line in /etc/rc.conf + + amavis_milter_enable="YES" + + Configuration templates are available in %%PREFIX%%/etc + as amavisd.conf-dist, amavisd.conf-sample and amavisd.conf-default. + Documentation is available in %%DOCSDIR%%. +******************************************************************* + diff -urN /usr/ports/security/amavisd-new/pkg-plist ./pkg-plist --- /usr/ports/security/amavisd-new/pkg-plist Fri Apr 29 03:24:24 2005 +++ ./pkg-plist Sun Jun 19 18:42:40 2005 @@ -1,3 +1,6 @@ +@comment $FreeBSD$ +@unexec %%RC_DIR%%/etc/rc.d/amavis-milter%%RC_SUFX%% stop > /dev/null 2>&1 || true +@unexec %%RC_DIR%%/etc/rc.d/amavisd%%RC_SUFX%% stop > /dev/null 2>&1 || true %%PORTDOCS%%%%DOCSDIR%%/AAAREADME.first %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/LDAP.schema @@ -30,9 +33,8 @@ etc/amavisd.conf-dist @exec [ ! -f %B/amavisd.conf ] && cp %B/%f %B/amavisd.conf etc/amavisd.conf-sample -%%AMAVIS_NOMILTER%%etc/rc.d/amavis-milter.sh -etc/rc.d/amavisd.sh -%%AMAVIS_NOMILTER%%sbin/amavis +%%AMAVIS_NOAMAVIS%%sbin/amavis %%AMAVIS_NOMILTER%%sbin/amavis-milter sbin/amavisd +sbin/amavisd-agent sbin/amavisd-nanny --- amavisd-new.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200506191738.j5JHccpa020885>