Security update

5 files changed, 128 insertions, 1 deletions

diff --git a/net-mail/amavis/ChangeLog b/net-mail/amavis/ChangeLog
index efb66a37f1e5..a4bfc5456f1a 100644
--- a/net-mail/amavis/ChangeLog
+++ b/net-mail/amavis/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/amavis
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-mail/amavis/ChangeLog,v 1.1 2002/02/01 21:53:34 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/amavis/ChangeLog,v 1.2 2002/09/05 12:02:58 aliz Exp $
+
+*amavis-0.2.1-r3 (05 Sep 2002)
+
+  05 Sep 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Security update, fixed detection of vlnx, fixed sandbox violations.
 
 *amavis-0.2.1-r2 (1 Feb 2002)
 
diff --git a/net-mail/amavis/amavis-0.2.1-r3.ebuild b/net-mail/amavis/amavis-0.2.1-r3.ebuild
new file mode 100644
index 000000000000..e27fee91666d
--- /dev/null
+++ b/net-mail/amavis/amavis-0.2.1-r3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-mail/amavis/amavis-0.2.1-r3.ebuild,v 1.1 2002/09/05 12:02:58 aliz Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Virus Scanner"
+SRC_URI="http://www.amavis.org/dist/${P}.tar.gz"
+HOMEPAGE="http://www.amavis.org"
+
+SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86 sparc sparc64"
+
+DEPEND="net-mail/maildrop
+	>=net-mail/tnef-0.13
+	>=net-mail/vlnx-407e
+	net-mail/qmail"
+
+src_unpack() {
+	unpack ${A}
+	
+	cd ${S}
+	patch -p0 < ${FILESDIR}/${P}-securetar.patch
+}
+
+src_compile() {
+	./reconf
+	patch -p0 < ${FILESDIR}/${P}-gentoo.diff
+	econf \
+		--with-logdir=/var/log/scanmail \
+		--with-virusdir=/var/tmp/virusmails \
+		--enable-qmail || die
+
+	make || die
+}
+
+src_install() {
+	try make prefix=${D}/usr install
+	into /usr
+	dodoc AUTHORS BUGS COPYING ChangeLog FAQ HINTS NEWS README* TODO
+	dodoc doc/amavis.txt
+	dohtml -r doc
+	dodir /var/log/scanmail
+	dodir /var/tmp/virusmails
+	chmod 777 ${D}/var/log/scanmail
+	chmod 777 ${D}/var/tmp/virusmails
+}
+
+pkg_setup() {
+	# from "createaccount" that was designed to run during the
+	# installation phase
+
+	error="no"
+	whoami=`/usr/bin/id | cut -d'(' -f2 | cut -d')' -f1`
+
+	aliases=/etc/mail/aliases
+
+	if test "`echo \"virusalert\" | grep \"@\" | wc -l`" -eq 1; then
+		echo "WARNING: using off-site mail account: \"virusalert\""
+		echo "WARNING: be sure it is able to receive mail"
+	else
+		if test "`ls /home | grep -w \"virusalert\" | wc -l`" -eq 1; then
+			true
+		else
+			if test -n "$aliases"; then
+				if test "`grep \"virusalert\" $aliases | wc -l`" -lt 1; then
+					if test -w "$aliases"; then
+						echo "virusalert: $whoami" >> $aliases
+					else
+						echo "WARNING: $aliases is not writable by \"$whoami\""
+						error="yes"
+					fi
+				fi
+			else
+				echo "WARNING: mail aliases file not found: /etc/aliases"
+				error="yes"
+			fi
+		fi
+	fi
+
+	if test "$error" = "yes"; then
+		einfo "WARNING: could not create mail account: \"virusalert\""
+		einfo "WARNING: be sure to create it manually"
+	fi
+}
diff --git a/net-mail/amavis/files/amavis-0.2.1-gentoo.diff b/net-mail/amavis/files/amavis-0.2.1-gentoo.diff
new file mode 100644
index 000000000000..570ee8fa7594
--- /dev/null
+++ b/net-mail/amavis/files/amavis-0.2.1-gentoo.diff
@@ -0,0 +1,23 @@
+--- configure	Thu Sep  5 12:15:04 2002
++++ configure	Thu Sep  5 12:15:19 2002
+@@ -3225,7 +3225,7 @@
+   ;;
+   *)
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH:/usr/bin:/usr/local/bin"
++  ac_dummy="$PATH:/usr/bin:/usr/local/bin:/opt/vlnx"
+   for ac_dir in $ac_dummy; do 
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/$ac_word; then
+
+--- src/scanmails/Makefile.in	Thu Sep  5 11:49:46 2002
++++ src/scanmails/Makefile.in	Thu Sep  5 11:49:58 2002
+@@ -226,7 +226,7 @@
+ installcheck: installcheck-am
+ install-exec-am: install-sbinSCRIPTS
+ 	@$(NORMAL_INSTALL)
+-	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
++	$(MAKE) $(AM_MAKEFLAGS)
+ install-exec: install-exec-am
+ 
+ install-data-am:
diff --git a/net-mail/amavis/files/amavis-0.2.1-securetar.patch b/net-mail/amavis/files/amavis-0.2.1-securetar.patch
new file mode 100644
index 000000000000..fabb157315da
--- /dev/null
+++ b/net-mail/amavis/files/amavis-0.2.1-securetar.patch
@@ -0,0 +1,13 @@
+--- src/securetar/securetar.c	Thu Sep  5 11:50:50 2002
++++ src/securetar/securetar.c	Thu Sep  5 13:32:15 2002
+@@ -231,8 +231,8 @@
+ 		/************************************/
+ 		/* Write out the corresponding data */
+ 		/************************************/
+-		while( FileSize>0 ) {
+-			FileSize-=(long)count=read(fdin,&block,sizeof(block));
++		while( FileSize>0 && (count=read(fdin,&block,sizeof(block))) ) {
++			FileSize-=(long)count;
+ 			write( fdout, &block, count );
+ 		}
+ 	}
diff --git a/net-mail/amavis/files/digest-amavis-0.2.1-r3 b/net-mail/amavis/files/digest-amavis-0.2.1-r3
new file mode 100644
index 000000000000..07a826c27a74
--- /dev/null
+++ b/net-mail/amavis/files/digest-amavis-0.2.1-r3
@@ -0,0 +1 @@
+MD5 8d2ce5007d5ad841498ba0294350d492 amavis-0.2.1.tar.gz 236011