Update amavis to 0.2.1p3. Changes are bugfixes, enhanced MIME decoding, and

the capability to decode and virus-check MS-TNEF attachments.

8 files changed, 237 insertions, 41 deletions

diff --git a/security/amavis/files/LICENSE.sendmail b/security/amavis/files/LICENSE.sendmail
new file mode 100644
index 00000000000..30c49986fbd
--- /dev/null
+++ b/security/amavis/files/LICENSE.sendmail
@@ -0,0 +1,79 @@
+			     SENDMAIL LICENSE
+
+The following license terms and conditions apply, unless a different
+license is obtained from Sendmail, Inc., 6425 Christie Ave, Fourth Floor,
+Emeryville, CA 94608, or by electronic mail at license@sendmail.com.
+
+License Terms:
+
+Use, Modification and Redistribution (including distribution of any
+modified or derived work) in source and binary forms is permitted only if
+each of the following conditions is met:
+
+1. Redistributions qualify as "freeware" or "Open Source Software" under
+   one of the following terms:
+
+   (a) Redistributions are made at no charge beyond the reasonable cost of
+       materials and delivery.
+
+   (b) Redistributions are accompanied by a copy of the Source Code or by an
+       irrevocable offer to provide a copy of the Source Code for up to three
+       years at the cost of materials and delivery.  Such redistributions
+       must allow further use, modification, and redistribution of the Source
+       Code under substantially the same terms as this license.  For the
+       purposes of redistribution "Source Code" means the complete compilable
+       and linkable source code of sendmail including all modifications.
+
+2. Redistributions of source code must retain the copyright notices as they
+   appear in each source code file, these license terms, and the
+   disclaimer/limitation of liability set forth as paragraph 6 below.
+
+3. Redistributions in binary form must reproduce the Copyright Notice,
+   these license terms, and the disclaimer/limitation of liability set
+   forth as paragraph 6 below, in the documentation and/or other materials
+   provided with the distribution.  For the purposes of binary distribution
+   the "Copyright Notice" refers to the following language:
+   "Copyright (c) 1998-2000 Sendmail, Inc.  All rights reserved."
+
+4. Neither the name of Sendmail, Inc. nor the University of California nor
+   the names of their contributors may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.  The name "sendmail" is a trademark of Sendmail, Inc.
+
+5. All redistributions must comply with the conditions imposed by the
+   University of California on certain embedded code, whose copyright
+   notice and conditions for redistribution are as follows:
+
+   (a) Copyright (c) 1988, 1993 The Regents of the University of
+       California.  All rights reserved.
+
+   (b) Redistribution and use in source and binary forms, with or without
+       modification, are permitted provided that the following conditions
+       are met:
+
+      (i)   Redistributions of source code must retain the above copyright
+            notice, this list of conditions and the following disclaimer.
+
+      (ii)  Redistributions in binary form must reproduce the above
+            copyright notice, this list of conditions and the following
+            disclaimer in the documentation and/or other materials provided
+            with the distribution.
+
+      (iii) Neither the name of the University nor the names of its
+            contributors may be used to endorse or promote products derived
+            from this software without specific prior written permission.
+
+6. Disclaimer/Limitation of Liability: THIS SOFTWARE IS PROVIDED BY
+   SENDMAIL, INC. AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+   WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+   NO EVENT SHALL SENDMAIL, INC., THE REGENTS OF THE UNIVERSITY OF
+   CALIFORNIA OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+   INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+   NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+   ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+   THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+Revision: 8.9, Last updated Date: 2000/03/03 19:24:11
diff --git a/security/amavis/files/amavis.m4 b/security/amavis/files/amavis.m4
new file mode 100644
index 00000000000..d87ae6ce6f3
--- /dev/null
+++ b/security/amavis/files/amavis.m4
@@ -0,0 +1,85 @@
+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.
+#
+# 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.
+#
+#
+_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   ###
+##################################################
+
+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')
+
+#
+#  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
+
+#
+#  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')
+
+#
+#  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')
+
+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/files/md5 b/security/amavis/files/md5
index f089af93867..917c46c6edf 100644
--- a/security/amavis/files/md5
+++ b/security/amavis/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/06/05 14:37:58 rh Exp $
+$NetBSD: md5,v 1.2 2000/10/23 14:57:14 rh Exp $
 
-MD5 (amavis-0.2.0-pre6.tar.gz) = a680ee512acc29ec67027a29b1222bd9
+MD5 (amavis-0.2.1-pre3.tar.gz) = a0102687ff8ccb53d0753b5ddd429cbc
diff --git a/security/amavis/files/patch-sum b/security/amavis/files/patch-sum
index ae7e789308b..298bbc6a641 100644
--- a/security/amavis/files/patch-sum
+++ b/security/amavis/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.2 2000/06/19 14:36:22 rh Exp $
+$NetBSD: patch-sum,v 1.3 2000/10/23 14:57:14 rh Exp $
 
-MD5 (patch-aa) = 0aec1efe32468e1593bba6ec9d9a4275
-MD5 (patch-ab) = fdbcfc863f389e3f99d659dc474b3683
+MD5 (patch-aa) = 213297c393d6f400f43651a0b1f9a91a
+MD5 (patch-ab) = c466d5fe57646e4a1e620a5bf54c93fe
diff --git a/security/amavis/patches/patch-aa b/security/amavis/patches/patch-aa
index bbc64ff7fe6..dbddc6dee95 100644
--- a/security/amavis/patches/patch-aa
+++ b/security/amavis/patches/patch-aa
@@ -1,13 +1,17 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/06/05 14:37:58 rh Exp $
+$NetBSD: patch-aa,v 1.2 2000/10/23 14:57:16 rh Exp $
 
---- configure.orig	Tue Jul 20 19:29:02 1999
-+++ configure	Mon Jun  5 16:06:52 2000
-@@ -2983,7 +2983,7 @@
- 
- 
- 
--deliver=/usr/bin/procmail
-+deliver=/usr/libexec/mail.local
- 
- 
- trap '' 1 2 15
+--- configure.orig	Mon Oct 23 16:11:15 2000
++++ configure
+@@ -2640,10 +2640,10 @@
+   then
+      tnef_arg="-x"
+   else
+-   $tnef -h 2>&1 | grep "put unpacked files in DIR" >/dev/null 2>&1
++   $tnef -h 2>&1 | grep "unpack files into DIR" >/dev/null 2>&1
+    if test $? -eq 0
+    then
+-     tnef_arg="-d"
++     tnef_arg="-C"
+    else
+     { echo "configure: error: Sorry, your tnef binary seems to be insecure. Please use the tnef file from http://world.std.com/~damned/software.html" 1>&2; exit 1; }
+    fi
diff --git a/security/amavis/patches/patch-ab b/security/amavis/patches/patch-ab
index 4b45d110b16..c5d3374d2d1 100644
--- a/security/amavis/patches/patch-ab
+++ b/security/amavis/patches/patch-ab
@@ -1,27 +1,49 @@
-$NetBSD: patch-ab,v 1.1 2000/06/19 14:36:51 rh Exp $
+$NetBSD: patch-ab,v 1.2 2000/10/23 14:57:16 rh Exp $
 
---- src/scanmails/scanmails.in.orig	Tue Jul 20 19:28:52 1999
-+++ src/scanmails/scanmails.in	Mon Jun 19 15:54:23 2000
-@@ -187,7 +187,7 @@
-     fi
+--- src/scanmails/scanmails.in.orig	Sat Sep 16 17:40:38 2000
++++ src/scanmails/scanmails.in
+@@ -352,7 +352,7 @@
+ 	sendmail_flags="${sendmail_flags} -C${origconf}"
+    else
+ 	SENDER="$2"
+-	RECEIPIENT="$7"
++	RECEIPIENT="$4"
+    fi
+ fi
+ 
+@@ -447,6 +447,8 @@
+     cat | ${formail} -f -A "${X_Header_String}" >${tmpdir}/receivedmail
  else
-     SENDER="$2"
--    RECEIPIENT="$7"
-+    RECEIPIENT="$4"
+     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
+@@ -1210,7 +1212,7 @@
+ 
+                    V I R U S  A L E R T
  
-@@ -242,11 +242,11 @@
- receiver=`echo ${RECEIPIENT} | ${sed} -e "s/[\\\`\\\\\$\(\)]//g"`
- sender=`echo ${SENDER} | ${sed} -e "s/[\\\`\\\\\$\(\)]//g"`
+-  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!
  
--if [ "$sender" != "$2" -o "$receiver" != "$7" ] ; then
-+if [ "$sender" != "$2" -o "$receiver" != "$4" ] ; then
-        cat <<EOF | ${mail} -s "AMaViS Intrusion???" ${mailto}
-        
- ############################################################
--   $7 or $2 is not a valid Email address
-+   $4 or $2 is not a valid Email address
-    (changed to $receiver and $sender)!
- ############################################################
+     Now it is on you to check your system for viruses           
+@@ -1236,7 +1238,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}
+@@ -1250,6 +1252,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
index 45f3fadffbc..af25cdeee0b 100644
--- a/security/amavis/pkg/MESSAGE
+++ b/security/amavis/pkg/MESSAGE
@@ -1,8 +1,11 @@
-$NetBSD: MESSAGE,v 1.2 2000/06/19 15:06:18 rh Exp $
+$NetBSD: MESSAGE,v 1.3 2000/10/23 14:57:16 rh Exp $
 
 ==========================================================================
   AMaViS has now been installed on your system.  In order to integrate
-  the virus scanner with sendmail, change
+  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,
@@ -10,7 +13,7 @@ Mlocal, P=/usr/libexec/mail.local, F=lsDFMAw5:/|@qrmn9, S=10/30, R=20/40,
 	A=mail -d $u
 
 
-  in your "sendmail.cf" to
+  in your installed "sendmail.cf" by
 
 
 Mlocal, P=@PREFIX@/sbin/scanmails, F=lsDFMAw5:/|@qrmn9, S=10/30, R=20/40,
diff --git a/security/amavis/pkg/PLIST b/security/amavis/pkg/PLIST
index c2d4abc900d..364c9dd39d1 100644
--- a/security/amavis/pkg/PLIST
+++ b/security/amavis/pkg/PLIST
@@ -1,4 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/06/05 14:37:58 rh Exp $
+@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