Updated amavis-0.2.1-r3 with proper directory permissions as suggested

on bug #10371.  Added mail system selection code found in bug #6863 to
amavis-0.3.12_pre8

3 files changed, 42 insertions, 14 deletions

diff --git a/net-mail/amavis/ChangeLog b/net-mail/amavis/ChangeLog
index dc5e4bbfccf1..0d28978b764e 100644
--- a/net-mail/amavis/ChangeLog
+++ b/net-mail/amavis/ChangeLog
@@ -1,9 +1,13 @@
 # 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.3 2002/10/23 20:32:57 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/amavis/ChangeLog,v 1.4 2002/11/15 17:14:54 raker Exp $
 
 *amavis-0.3.12_pre8 (23 Oct 2002)
 
+  15 Nov 2002; Nick Hadaway <raker@gentoo.org> amavis-0.3.12_pre8.ebuild :
+  The ebuild should now detect what mail system you are using.
+  postfix, exim, qmail, and sendmail are detected.
+
   23 Oct 2002; Nick Hadaway <raker@gentoo.org> amavis-0.3.12_pre8.ebuild,
   files/digest-amavis-0.3.12_pre8 :
   Version bump.  0.2.x of amavis is non-maintained code.  The ebuild currently
@@ -12,6 +16,9 @@
 
 *amavis-0.2.1-r3 (05 Sep 2002)
 
+  15 Nov 2002; Nick Hadaway <raker@gentoo.org> amavis-0.2.1-r3.ebuild :
+  Updated permissions on scanmail and virusmails
+
   05 Sep 2002; Daniel Ahlberg <aliz@gentoo.org> :
   Security update, fixed detection of vlnx, fixed sandbox violations.
 
diff --git a/net-mail/amavis/amavis-0.2.1-r3.ebuild b/net-mail/amavis/amavis-0.2.1-r3.ebuild
index ed58aba2a713..884cfa76945e 100644
--- a/net-mail/amavis/amavis-0.2.1-r3.ebuild
+++ b/net-mail/amavis/amavis-0.2.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/amavis/amavis-0.2.1-r3.ebuild,v 1.3 2002/10/04 06:06:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/amavis/amavis-0.2.1-r3.ebuild,v 1.4 2002/11/15 17:14:54 raker Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Virus Scanner"
@@ -42,8 +42,8 @@ src_install() {
 	dohtml -r doc
 	dodir /var/log/scanmail
 	dodir /var/tmp/virusmails
-	chmod 777 ${D}/var/log/scanmail
-	chmod 777 ${D}/var/tmp/virusmails
+	chmod 1777 ${D}/var/log/scanmail
+	chmod 1777 ${D}/var/tmp/virusmails
 }
 
 pkg_setup() {
diff --git a/net-mail/amavis/amavis-0.3.12_pre8.ebuild b/net-mail/amavis/amavis-0.3.12_pre8.ebuild
index 707424242136..574a36019ca1 100644
--- a/net-mail/amavis/amavis-0.3.12_pre8.ebuild
+++ b/net-mail/amavis/amavis-0.3.12_pre8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/amavis/amavis-0.3.12_pre8.ebuild,v 1.2 2002/10/24 17:34:19 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/amavis/amavis-0.3.12_pre8.ebuild,v 1.3 2002/11/15 17:14:54 raker Exp $
 
 DESCRIPTION="A perl module which integrates virus scanning software with your MTA"
 HOMEPAGE="http://www.amavis.org"
@@ -21,7 +21,6 @@ DEPEND="sys-devel/perl
 	sys-apps/sharutils
 	app-arch/unrar
 	app-arch/zoo
-	net-mail/postfix
 	dev-perl/IO-stringy
 	dev-perl/Unix-Syslog
 	dev-perl/MailTools
@@ -32,7 +31,9 @@ DEPEND="sys-devel/perl
 	>=dev-perl/Compress-Zlib-1.14
 	dev-perl/Archive-Tar
 	>=dev-perl/Archive-Zip-1.0
-	dev-perl/libnet"
+	dev-perl/libnet
+	virtual/mta
+	virtual/mda"
 
 S="${WORKDIR}/${P/_/}"
 
@@ -61,11 +62,16 @@ pkg_setup() {
 
 }
 
+mymta=`grep "^virtual/mta net-mail\/\(exim\|postfix\|qmail\)" /var/cache/edb/virtuals | awk -F/ '{print $3}'`
+
 src_unpack() {
 
 	unpack ${A}
 	cd ${S}
-	patch -p1 < ${FILESDIR}/0.3.12-postfix.diff || die "patch failed"
+
+	if [ "$mymta" == "postfix" ]; then
+		patch -p1 < ${FILESDIR}/0.3.12-postfix.diff || die "patch failed"
+	fi
 
 }
 
@@ -73,8 +79,15 @@ src_compile() {
 
 	local myconf
 
-	# Postfix is the only one supported currently.  More mta's coming soon.
-	myconf="--enable-postfix"
+	if [ "$mymta" == "postfix" ]; then
+		myconf="--enable-postfix"
+	elif [ "$mymta" == "qmail" ]; then
+		myconf="--enable-qmail"
+	elif [ "$mymta" == "exim" ]; then
+		myconf="--enable-exim"
+	elif [ "$mymta" == "sendmail" ]; then
+		mycfonf="--enable-sendmail"
+	fi
 
 	# The quarantine directory for infected emails
 	myconf="${myconf} --with-virusdir=/var/amavis/quarantine"
@@ -88,8 +101,16 @@ src_compile() {
 src_install() {
 
 	dodir /var/amavis/quarantine
-	chown -R postfix:postfix ${D}/var/amavis
-	chmod -R ${D}/var/amavis
+
+	if [ "$mymta" == "postfix" ]; then
+		chown -R postfix:postfix ${D}/var/amavis
+	elif [ "$mymta" == "qmail" ]; then
+		chown -R qmailq:qmail ${D}/var/amavis
+	fi
+		
+
+	chmod -R 770 ${D}/var/amavis
+
 	keepdir /var/amavis /var/amavis/quarantine
 
 	einstall \
@@ -105,10 +126,10 @@ src_install() {
 pkg_postinst() {
 
 	einfo ""
-	einfo "For amavis to work properly with your postfix installation"
+	einfo "For amavis to work properly with your $mymta installation"
 	einfo "there are some configuration changes required"
 	einfo ""
-	einfo "less /usr/share/doc/amavis-0.3.12_pre8/README.postfix.gz"
+	einfo "less /usr/share/doc/amavis-0.3.12_pre8/README.$mymta.gz"
 	einfo ""
 
 }