diff options
Diffstat (limited to 'security')
| -rw-r--r-- | security/amavis/Makefile | 54 | ||||
| -rw-r--r-- | security/amavis/distinfo | 7 | ||||
| -rw-r--r-- | security/amavis/files/amavis.m4 | 101 | ||||
| -rw-r--r-- | security/amavis/patches/patch-ab | 49 | ||||
| -rw-r--r-- | security/amavis/pkg/MESSAGE | 23 | ||||
| -rw-r--r-- | security/amavis/pkg/PLIST | 25 |
6 files changed, 91 insertions, 168 deletions
diff --git a/security/amavis/Makefile b/security/amavis/Makefile index 318e50c4a52..1ed72f8de6e 100644 --- a/security/amavis/Makefile +++ b/security/amavis/Makefile @@ -1,15 +1,15 @@ -# $NetBSD: Makefile,v 1.7 2001/09/27 23:18:37 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2001/10/22 05:49:50 martti Exp $ # -DISTNAME= amavis-0.2.1 -PKGNAME= amavis-0.2.1nb4 +DISTNAME= amavisd-snapshot-${VERSION} +PKGNAME= amavis-${VERSION} CATEGORIES= security mail MASTER_SITES= http://www.amavis.org/dist/ \ http://aachalon.de/AMaViS/ MAINTAINER= rh@netbsd.org HOMEPAGE= http://www.amavis.org/ -COMMENT= mail virus scanner +COMMENT= Mail virus scanner DEPENDS+= uvscan-[0-9]*:../../security/uvscan DEPENDS+= maildrop-[0-9]*:../../mail/maildrop @@ -22,23 +22,53 @@ DEPENDS+= lha-[0-9]*:../../archivers/lha DEPENDS+= zoo-[0-9]*:../../archivers/zoo DEPENDS+= freeze-[0-9]*:../../archivers/freeze DEPENDS+= arc-[0-9]*:../../archivers/arc +DEPENDS+= p5-Archive-Tar-[0-9]*:../../archivers/p5-Archive-Tar +DEPENDS+= p5-Archive-Zip-[0-9]*:../../archivers/p5-Archive-Zip +DEPENDS+= p5-Compress-Zlib-[0-9]*:../../devel/p5-Compress-Zlib +DEPENDS+= p5-Convert-TNEF-[0-9]*:../../converters/p5-Convert-TNEF +DEPENDS+= p5-Convert-UUlib-[0-9]*:../../converters/p5-Convert-UUlib +DEPENDS+= p5-MIME-tools>=5.313:../../mail/p5-MIME-tools +DEPENDS+= p5-Net-[0-9]*:../../net/p5-Net +DEPENDS+= p5-Unix-Syslog-[0-9]*:../../sysutils/p5-Unix-Syslog +VERSION= 20010714 + +SMTPPORT?= 10025 # target port for scanned mails VIRUSDIR?= /var/log/virusmails # where to put contaminated mails VIRUSMAILTO?= security # whom to notify about viruses GNU_CONFIGURE= YES + CONFIGURE_ENV+= procmail="/usr/libexec/mail.local" + +CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc/amavis CONFIGURE_ARGS+=--with-virusdir=${VIRUSDIR} CONFIGURE_ARGS+=--with-mailto=${VIRUSMAILTO} +CONFIGURE_ARGS+=--enable-all +CONFIGURE_ARGS+=--enable-smtp --with-smtp-port=${SMTPPORT} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/zipsecure/zipsecure ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/src/securetar/securetar ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/src/scanmails/scanmails ${PREFIX}/sbin - ${SED} -e 's#@PREFIX@#${PREFIX}#g' < ${FILESDIR}/amavis.m4 \ - >${WRKDIR}/amavis.m4 - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/amavis - ${INSTALL_DATA} ${FILESDIR}/LICENSE.sendmail ${PREFIX}/share/examples/amavis - ${INSTALL_DATA} ${WRKDIR}/amavis.m4 ${PREFIX}/share/examples/amavis + # Program files + ${INSTALL_PROGRAM} ${WRKSRC}/amavis/amavis ${PREFIX}/sbin + ${INSTALL_SCRIPT} ${WRKSRC}/amavis/amavisd ${PREFIX}/sbin + # Documents + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/amavis + ${INSTALL_DATA} ${WRKSRC}/doc/amavis.html ${PREFIX}/share/doc/amavis + ${INSTALL_DATA} ${WRKSRC}/doc/amavis.png ${PREFIX}/share/doc/amavis + ${INSTALL_DATA} ${WRKSRC}/doc/amavis.txt ${PREFIX}/share/doc/amavis + ${INSTALL_DATA} ${FILESDIR}/LICENSE.sendmail ${PREFIX}/share/doc/amavis + ${INSTALL_DATA} ${WRKSRC}/FAQ ${PREFIX}/share/doc/amavis + ${INSTALL_DATA} ${WRKSRC}/NEWS ${PREFIX}/share/doc/amavis + ${INSTALL_DATA} ${WRKSRC}/README.exim ${PREFIX}/share/doc/amavis + ${INSTALL_DATA} ${WRKSRC}/README.milter ${PREFIX}/share/doc/amavis + ${INSTALL_DATA} ${WRKSRC}/README.postfix ${PREFIX}/share/doc/amavis + ${INSTALL_DATA} ${WRKSRC}/README.qmail ${PREFIX}/share/doc/amavis + ${INSTALL_DATA} ${WRKSRC}/README.scanners ${PREFIX}/share/doc/amavis + ${INSTALL_DATA} ${WRKSRC}/README.sendmail ${PREFIX}/share/doc/amavis + ${INSTALL_DATA} ${WRKSRC}/amavis/amavisd.conf \ + ${PREFIX}/share/doc/amavis + ${SED} "s+@PREFIX@+${PREFIX}+g" < ${FILESDIR}/amavis.m4 \ + > ${WRKDIR}/amavis.m4 + ${INSTALL_DATA} ${WRKDIR}/amavis.m4 ${PREFIX}/share/doc/amavis .include "../../mk/bsd.pkg.mk" diff --git a/security/amavis/distinfo b/security/amavis/distinfo index 4efb6391064..cbeb588f819 100644 --- a/security/amavis/distinfo +++ b/security/amavis/distinfo @@ -1,5 +1,4 @@ -$NetBSD: distinfo,v 1.3 2001/09/14 21:56:49 wiz Exp $ +$NetBSD: distinfo,v 1.4 2001/10/22 05:49:50 martti Exp $ -SHA1 (amavis-0.2.1.tar.gz) = c47f60525a289274b88f7eaa47db1a9e888092ef -Size (amavis-0.2.1.tar.gz) = 236011 bytes -SHA1 (patch-ab) = dd2aa50136d3b89ce12c149c56b6f8c7e659d0d4 +SHA1 (amavisd-snapshot-20010714.tar.gz) = 2099c9e57ed05de30b5d2218c7deb56ba3230b33 +Size (amavisd-snapshot-20010714.tar.gz) = 290862 bytes diff --git a/security/amavis/files/amavis.m4 b/security/amavis/files/amavis.m4 index d87ae6ce6f3..ed17c900105 100644 --- a/security/amavis/files/amavis.m4 +++ b/security/amavis/files/amavis.m4 @@ -1,85 +1,40 @@ PUSHDIVERT(-1) # -# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. -# All rights reserved. -# Copyright (c) 1983 Eric P. Allman. All rights reserved. -# Copyright (c) 1988, 1993 -# The Regents of the University of California. All rights reserved. +# amavis mailer definition for amavis-perl (http://www.amavis.org) # -# By using this file, you agree to the terms and conditions set -# forth in the LICENSE file which can be found at the top level of -# the sendmail distribution. +# Copyright (c) 2000 Yan Seiner +# GPL distribution - all disclaimers apply. # +# Adopted & extented by Rainer Link, SuSE GmbH, <link@suse.de>, 03/02/2001 +# +# Currently UNTESTED +# USE AT YOUR OWN RISK # -_DEFIFNOT(`_DEF_LOCAL_MAILER_FLAGS', `lsDFMAw5:/|@q') -_DEFIFNOT(`LOCAL_MAILER_FLAGS', `Prmn9') -ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /bin/mail)') -ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', `mail -d $u')') -ifdef(`LOCAL_MAILER_DSN_DIAGNOSTIC_CODE',, `define(`LOCAL_MAILER_DSN_DIAGNOSTIC_CODE', `X-Unix')') -_DEFIFNOT(`_DEF_LOCAL_SHELL_FLAGS', `lsDFMoq') -_DEFIFNOT(`LOCAL_SHELL_FLAGS', `eu9') -ifdef(`LOCAL_SHELL_PATH',, `define(`LOCAL_SHELL_PATH', /bin/sh)') -ifdef(`LOCAL_SHELL_ARGS',, `define(`LOCAL_SHELL_ARGS', `sh -c $u')') -ifdef(`LOCAL_SHELL_DIR',, `define(`LOCAL_SHELL_DIR', `$z:/')') -POPDIVERT -################################################## -### Local and Program Mailer specification ### -################################################## +ifdef(`AMAVIS_MAILER_ARGS',, + `define(`AMAVIS_MAILER_ARGS', amavis $f $u)') +ifdef(`AMAVIS_MAILER_PATH',, + `define(`AMAVIS_MAILER_PATH', @PREFIX@/sbin/amavis)') +ifdef(`AMAVIS_MAILER_FLAGS',, + `define(`AMAVIS_MAILER_FLAGS', `mlsACDFMS5:/|@qhP')') +ifdef(`AMAVIS_MAILER_USER',, + `define(`AMAVIS_MAILER_USER', amavis)') +ifdef(`AMAVIS_MAILER_GROUP',, + `define(`AMAVIS_MAILER_GROUP', amavis)') -VERSIONID(`Id: local.m4,v 8.50 1999/11/21 19:02:08 ca Exp') -# -# Envelope sender rewriting -# -SEnvFromL=10 -R<@> $n errors to mailer-daemon -R@ <@ $*> $n temporarily bypass Sun bogosity -R$+ $: $>AddDomain $1 add local domain if needed -R$* $: $>MasqEnv $1 do masquerading - -# -# Envelope recipient rewriting -# -SEnvToL=20 -R$+ < @ $* > $: $1 strip host part -ifdef(`_FFR_ADDR_TYPE', `dnl -ifdef(`confUSERDB_SPEC', `dnl', -`dnl Do not forget to bump V9 to V10 before removing _FFR_ADDR_TYPE check -R$+ + $* $: < $&{addr_type} > $1 + $2 mark with addr type -R<e s> $+ + $* $: $1 remove +detail for sender -R< $* > $+ $: $2 else remove mark')', `dnl') +POPDIVERT +####################################### +### AMAVIS Mailer specification ### +####################################### -# -# Header sender rewriting -# -SHdrFromL=30 -R<@> $n errors to mailer-daemon -R@ <@ $*> $n temporarily bypass Sun bogosity -R$+ $: $>AddDomain $1 add local domain if needed -R$* $: $>MasqHdr $1 do masquerading +VERSIONID(`@(#)amavis.m4 03/02/2001') -# -# Header recipient rewriting -# -SHdrToL=40 -R$+ $: $>AddDomain $1 add local domain if needed -ifdef(`_ALL_MASQUERADE_', -`R$* $: $>MasqHdr $1 do all-masquerading', -`R$* < @ *LOCAL* > $* $: $1 < @ $j . > $2') +Mamavis, P=AMAVIS_MAILER_PATH, F=AMAVIS_MAILER_FLAGS, S=0, R=0, + T=DNS/RFC822/X-Unix, + ifdef(`AMAVIS_MAILER_MAX', `M=AMAVIS_MAILER_MAX, ')A=AMAVIS_MAILER_ARGS, + U=AMAVIS_MAILER_USER:AMAVIS_MAILER_GROUP -# -# Common code to add local domain name (only if always-add-domain) -# -SAddDomain=50 -ifdef(`_ALWAYS_ADD_DOMAIN_', `dnl -R$* < @ $* > $* $@ $1 < @ $2 > $3 already fully qualified -R$+ $@ $1 < @ *LOCAL* > add local qualification', -`dnl') +LOCAL_RULE_0 +R$* $#amavis $:$1 -Mlocal, P=@PREFIX@/sbin/scanmails, F=_MODMF_(CONCAT(_DEF_LOCAL_MAILER_FLAGS, LOCAL_MAILER_FLAGS), `LOCAL'), S=EnvFromL/HdrFromL, R=EnvToL/HdrToL,_OPTINS(`LOCAL_MAILER_EOL', ` E=', `, ') - _OPTINS(`LOCAL_MAILER_MAX', `M=', `, ')_OPTINS(`LOCAL_MAILER_MAXMSGS', `m=', `, ')_OPTINS(`LOCAL_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/LOCAL_MAILER_DSN_DIAGNOSTIC_CODE, - A=LOCAL_MAILER_ARGS -Mprog, P=LOCAL_SHELL_PATH, F=CONCAT(_DEF_LOCAL_SHELL_FLAGS, LOCAL_SHELL_FLAGS), S=EnvFromL/HdrFromL, R=EnvToL/HdrToL, D=LOCAL_SHELL_DIR, - _OPTINS(`LOCAL_MAILER_MAX', `M=', `, ')T=X-Unix/X-Unix/X-Unix, - A=LOCAL_SHELL_ARGS diff --git a/security/amavis/patches/patch-ab b/security/amavis/patches/patch-ab deleted file mode 100644 index 68186a7a258..00000000000 --- a/security/amavis/patches/patch-ab +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2001/09/14 21:56:50 wiz Exp $ - ---- src/scanmails/scanmails.in.orig Tue Oct 31 17:47:28 2000 -+++ src/scanmails/scanmails.in -@@ -360,7 +360,7 @@ - sendmail_flags="${sendmail_flags} -C${origconf}" - else - SENDER="$2" -- RECIPIENT="$7" -+ RECIPIENT="$4" - fi - fi - -@@ -455,6 +455,8 @@ - cat | ${formail} -f -A "${X_Header_String}" >${tmpdir}/receivedmail - else - cat >${tmpdir}/receivedmail -+ awk <${tmpdir}/receivedmail >${tmpdir}/header '/^$/ {exit 0;} // {print;}' -+ maildest=`grep '^To:' ${tmpdir}/header | head -1 | cut -d' ' -f 2-` - fi - - mkdir ${tmpdir}/unpacked -@@ -1287,7 +1289,7 @@ - - V I R U S A L E R T - -- Our viruschecker found a VIRUS in your email to "${receiver}". -+ Our viruschecker found a VIRUS in your email to "${maildest}". - We stopped delivery of this email! - - Now it is on you to check your system for viruses -@@ -1313,7 +1315,7 @@ - - ############### send a mail to the addressee ######################## - --cat <<EOF| ${sendmail_wrapper} ${sendmail_flags} -+cat <<EOF| cat - ${tmpdir}/header | ${sendmail_wrapper} ${sendmail_flags} - From: ${mailfrom} - To: ${receiver} - Subject: VIRUS IN A MAIL FOR YOU FROM ${sender} -@@ -1327,6 +1329,8 @@ - Delivery of the email was stopped! - - Please contact your system administrator for details -+ -+ The header of the stopped message was: - - EOF - fi diff --git a/security/amavis/pkg/MESSAGE b/security/amavis/pkg/MESSAGE deleted file mode 100644 index cfc8556ec09..00000000000 --- a/security/amavis/pkg/MESSAGE +++ /dev/null @@ -1,23 +0,0 @@ -========================================================================== -$NetBSD: MESSAGE,v 1.4 2001/01/29 11:34:40 wiz Exp $ - - AMaViS has now been installed on your system. In order to integrate - the virus scanner with sendmail, copy - ${PREFIX}/share/examples/amavis/amavis.m4 to the 'mailer' sendmail - configuration directory. Then use 'amavis' instead of 'local' for - local mail delivery. Alternatively, you can simply replace - - -Mlocal, P=/usr/libexec/mail.local, F=lsDFMAw5:/|@qrmn9, S=10/30, R=20/40, - T=DNS/RFC822/X-Unix, - A=mail -d $u - - - in your installed "sendmail.cf" by - - -Mlocal, P=${PREFIX}/sbin/scanmails, F=lsDFMAw5:/|@qrmn9, S=10/30, R=20/40, - T=DNS/RFC822/X-Unix, - A=scanmails -d $u - -========================================================================== diff --git a/security/amavis/pkg/PLIST b/security/amavis/pkg/PLIST index 364c9dd39d1..8a00282e863 100644 --- a/security/amavis/pkg/PLIST +++ b/security/amavis/pkg/PLIST @@ -1,7 +1,18 @@ -@comment $NetBSD: PLIST,v 1.2 2000/10/23 14:57:16 rh Exp $ -bin/zipsecure -bin/securetar -sbin/scanmails -share/examples/amavis/LICENSE.sendmail -share/examples/amavis/amavis.m4 -@dirrm share/examples/amavis +@comment $NetBSD: PLIST,v 1.3 2001/10/22 05:49:51 martti Exp $ +sbin/amavis +sbin/amavisd +share/doc/amavis/FAQ +share/doc/amavis/LICENSE.sendmail +share/doc/amavis/NEWS +share/doc/amavis/README.exim +share/doc/amavis/README.milter +share/doc/amavis/README.postfix +share/doc/amavis/README.qmail +share/doc/amavis/README.scanners +share/doc/amavis/README.sendmail +share/doc/amavis/amavis.html +share/doc/amavis/amavis.m4 +share/doc/amavis/amavis.png +share/doc/amavis/amavis.txt +share/doc/amavis/amavisd.conf +@dirrm share/doc/amavis |