Remove security/amavis -- discontinued; security/amavisd-new is one

replacement.

No disagreement on pkgsrc-users.

10 files changed, 1 insertions, 328 deletions

diff --git a/security/Makefile b/security/Makefile
index d26d8c4babd..4731e886db5 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.293 2007/03/25 06:13:36 wiz Exp $
+# $NetBSD: Makefile,v 1.294 2007/04/01 21:17:16 wiz Exp $
 #
 
 COMMENT=	Security tools
@@ -12,7 +12,6 @@ SUBDIR+=	PAM
 SUBDIR+=	aide
 SUBDIR+=	aide06
 SUBDIR+=	amap
-SUBDIR+=	amavis
 SUBDIR+=	amavis-perl
 SUBDIR+=	amavisd-new
 SUBDIR+=	antonym
diff --git a/security/amavis/DESCR b/security/amavis/DESCR
deleted file mode 100644
index 52f54252074..00000000000
--- a/security/amavis/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-AMaViS (A Mail Virus Scanner) scans e-mail attachments for viruses
-using third-party virus scanners available for UNIX environments.
-It resides on a UNIX machine and looks through the attached files
-arriving via e-mail, generates reports when a virus is found, and
-sets the delivery on hold.
diff --git a/security/amavis/MESSAGE b/security/amavis/MESSAGE
deleted file mode 100644
index 2022f4a08ee..00000000000
--- a/security/amavis/MESSAGE
+++ /dev/null
@@ -1,23 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/24 12:30:32 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/Makefile b/security/amavis/Makefile
deleted file mode 100644
index 6f7fca759da..00000000000
--- a/security/amavis/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# $NetBSD: Makefile,v 1.18 2006/02/05 23:10:42 joerg Exp $
-#
-
-DISTNAME=	amavis-0.2.1
-PKGREVISION=	6
-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
-
-CONFLICTS+=	amavis-perl-[0-9]*
-
-DEPENDS+=	uvscan-[0-9]*:../../security/uvscan
-DEPENDS+=	maildrop-[0-9]*:../../mail/maildrop
-DEPENDS+=	tnef-[0-9]*:../../mail/tnef
-DEPENDS+=	unzip-[0-9]*:../../archivers/unzip
-DEPENDS+=	unarj-[0-9]*:../../archivers/unarj
-DEPENDS+=	unrar-[0-9]*:../../archivers/unrar
-DEPENDS+=	xbin-[0-9]*:../../archivers/xbin
-DEPENDS+=	lha-[0-9]*:../../archivers/lha
-DEPENDS+=	zoo-[0-9]*:../../archivers/zoo
-DEPENDS+=	freeze-[0-9]*:../../archivers/freeze
-DEPENDS+=	arc-[0-9]*:../../archivers/arc
-
-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_ENV+=	BASH=${TOOLS_SH:Q}
-CONFIGURE_ARGS+=--with-virusdir=${VIRUSDIR:Q}
-CONFIGURE_ARGS+=--with-mailto=${VIRUSMAILTO:Q}
-
-INSTALLATION_DIRS=	bin sbin
-
-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
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/security/amavis/PLIST b/security/amavis/PLIST
deleted file mode 100644
index 678eddc1dcb..00000000000
--- a/security/amavis/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:16:29 zuntum Exp $
-bin/zipsecure
-bin/securetar
-sbin/scanmails
-share/examples/amavis/LICENSE.sendmail
-share/examples/amavis/amavis.m4
-@dirrm share/examples/amavis
diff --git a/security/amavis/distinfo b/security/amavis/distinfo
deleted file mode 100644
index fa41e81a6ee..00000000000
--- a/security/amavis/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 13:10:04 agc Exp $
-
-SHA1 (amavis-0.2.1.tar.gz) = c47f60525a289274b88f7eaa47db1a9e888092ef
-RMD160 (amavis-0.2.1.tar.gz) = 2f10064f724f9d359596a823bcc6f20293a4f8e6
-Size (amavis-0.2.1.tar.gz) = 236011 bytes
-SHA1 (patch-aa) = 4f4e903890c6008e47c0a7e93c9d6f5c7a4a0e74
-SHA1 (patch-ab) = 7c75dff5025f3c31c9e84d837c17a223ae1a1a00
diff --git a/security/amavis/files/LICENSE.sendmail b/security/amavis/files/LICENSE.sendmail
deleted file mode 100644
index 30c49986fbd..00000000000
--- a/security/amavis/files/LICENSE.sendmail
+++ /dev/null
@@ -1,79 +0,0 @@
-			     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
deleted file mode 100644
index d87ae6ce6f3..00000000000
--- a/security/amavis/files/amavis.m4
+++ /dev/null
@@ -1,85 +0,0 @@
-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/patches/patch-aa b/security/amavis/patches/patch-aa
deleted file mode 100644
index e0014704aec..00000000000
--- a/security/amavis/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2003/04/11 22:06:24 cjep Exp $
-
---- configure.orig	2000-10-31 16:21:04.000000000 +0000
-+++ configure
-@@ -1744,7 +1744,7 @@ fi
- test -n "$unzip" && break
- done
- 
--for ac_prog in gtar tar
-+for ac_prog in tar gtar
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
-@@ -3876,7 +3876,7 @@ echo $ac_n "checking if tar removes lead
- echo "configure:3877: checking if tar removes leading / from archive" >&5
-  testfile="tarcheck$$"
-  touch /tmp/$testfile
-- $tar cPf /tmp/$testfile.tar /tmp/$testfile > /dev/null 2>&1
-+ $tar cf /tmp/$testfile.tar /tmp/$testfile > /dev/null 2>&1
-  rm -f /tmp/${testfile}
-  $tar xf  /tmp/$testfile.tar > /dev/null 2>&1
-  if test -d "./tmp"; then
diff --git a/security/amavis/patches/patch-ab b/security/amavis/patches/patch-ab
deleted file mode 100644
index 65a97b0b456..00000000000
--- a/security/amavis/patches/patch-ab
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2003/04/11 22:06:24 cjep Exp $
-
---- src/scanmails/scanmails.in.orig	2000-10-31 16:47:28.000000000 +0000
-+++ src/scanmails/scanmails.in
-@@ -360,7 +360,7 @@ else
- 	sendmail_flags="${sendmail_flags} -C${origconf}"
-    else
- 	SENDER="$2"
--	RECIPIENT="$7"
-+	RECIPIENT="$4"
-    fi
- fi
- 
-@@ -455,6 +455,8 @@ if [ "x$x_header" = "xyes" ] && [ "x${fo
-     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 @@ Subject: VIRUS IN YOUR MAIL TO ${receive
- 
-                    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 @@ if [ "x${notifyreceiver}" = "xyes" ] ; t
- 
- ############### 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}
-@@ -1328,6 +1330,8 @@ Subject: VIRUS IN A MAIL FOR YOU FROM ${
-   
-   Please contact your system administrator for details
- 
-+  The header of the stopped message was:
-+
- EOF
- fi
-