Do not change config file to disable spam checks - amavisd-new disables them automagically if SA is not present. Suggested by Andrew Gaffney <agaffney at gentoo.org>.

(Portage version: 2.1.2_rc2-r5)

6 files changed, 13 insertions, 36 deletions

diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index 8696e4906d34..b2e895dcd62d 100644
--- a/mail-filter/amavisd-new/ChangeLog
+++ b/mail-filter/amavisd-new/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-filter/amavisd-new
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.96 2006/10/20 21:18:51 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.97 2006/12/10 20:48:12 ticho Exp $
+
+  10 Dec 2006; Andrej Kacian <ticho@gentoo.org> amavisd-new-2.3.3-r2.ebuild,
+  amavisd-new-2.4.1.ebuild, amavisd-new-2.4.2.ebuild,
+  amavisd-new-2.4.2-r1.ebuild, amavisd-new-2.4.3.ebuild:
+  Do not change config file to disable spam checks - amavisd-new disables them
+  automagically if SA is not present. Suggested by Andrew Gaffney <agaffney at
+  gentoo.org>.
 
   20 Oct 2006; Bryan Østergaard <kloeri@gentoo.org>
   amavisd-new-2.4.1.ebuild:
diff --git a/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild
index 764c2b91c9e3..dd1a4f440f4b 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild,v 1.13 2006/06/15 00:15:58 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild,v 1.14 2006/12/10 20:48:12 ticho Exp $
 
 inherit eutils
 
@@ -111,12 +111,6 @@ src_install() {
 		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(dnsdomainname)';:" \
 			/etc/amavisd.conf
 	fi
-	if ! $(has_version mail-filter/spamassassin) ; then
-		einfo "Disabling anti-spam code in amavisd.conf..."
-
-		dosed "s:^#[\t ]*@bypass_spam_checks_maps[\t ]*=[\t ]*(1);:\@bypass_spam_checks_maps = (1);:" \
-			/etc/amavisd.conf
-	fi
 
 	newinitd "${FILESDIR}/amavisd.rc6" amavisd
 	dosed "s:/var/run/amavis/:$AMAVIS_ROOT/:g" /etc/init.d/amavisd
diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild
index 1acd05df39c7..e97a31d31a6d 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild,v 1.7 2006/10/20 21:18:51 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild,v 1.8 2006/12/10 20:48:12 ticho Exp $
 
 inherit eutils
 
@@ -109,12 +109,6 @@ src_install() {
 		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(dnsdomainname)';:" \
 			/etc/amavisd.conf
 	fi
-	if ! $(has_version mail-filter/spamassassin) ; then
-		einfo "Disabling anti-spam code in amavisd.conf..."
-
-		dosed "s:^#[\t ]*@bypass_spam_checks_maps[\t ]*=[\t ]*(1);:\@bypass_spam_checks_maps = (1);:" \
-			/etc/amavisd.conf
-	fi
 
 	newinitd "${FILESDIR}/amavisd.rc6" amavisd
 	dosed "s:/var/run/amavis/:$AMAVIS_ROOT/:g" /etc/init.d/amavisd
diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.2-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.2-r1.ebuild
index e88934e1b681..e6c7882ac973 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.4.2-r1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.2-r1.ebuild,v 1.1 2006/08/03 23:53:33 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.2-r1.ebuild,v 1.2 2006/12/10 20:48:12 ticho Exp $
 
 inherit eutils
 
@@ -111,12 +111,6 @@ src_install() {
 		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(dnsdomainname)';:" \
 			/etc/amavisd.conf
 	fi
-	if ! $(has_version mail-filter/spamassassin) ; then
-		einfo "Disabling anti-spam code in amavisd.conf..."
-
-		dosed "s:^#[\t ]*@bypass_spam_checks_maps[\t ]*=[\t ]*(1);:\@bypass_spam_checks_maps = (1);:" \
-			/etc/amavisd.conf
-	fi
 
 	newinitd "${FILESDIR}/amavisd.rc6" amavisd
 	dosed "s:/var/run/amavis/:$AMAVIS_ROOT/:g" /etc/init.d/amavisd
diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.2.ebuild
index a1e040e6441e..0718fefefc48 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.4.2.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.2.ebuild,v 1.1 2006/07/02 17:34:13 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.2.ebuild,v 1.2 2006/12/10 20:48:12 ticho Exp $
 
 inherit eutils
 
@@ -109,12 +109,6 @@ src_install() {
 		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(dnsdomainname)';:" \
 			/etc/amavisd.conf
 	fi
-	if ! $(has_version mail-filter/spamassassin) ; then
-		einfo "Disabling anti-spam code in amavisd.conf..."
-
-		dosed "s:^#[\t ]*@bypass_spam_checks_maps[\t ]*=[\t ]*(1);:\@bypass_spam_checks_maps = (1);:" \
-			/etc/amavisd.conf
-	fi
 
 	newinitd "${FILESDIR}/amavisd.rc6" amavisd
 	dosed "s:/var/run/amavis/:$AMAVIS_ROOT/:g" /etc/init.d/amavisd
diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.3.ebuild
index 101dddd35d1b..ca0043143faf 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.4.3.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.3.ebuild,v 1.1 2006/10/04 14:17:25 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.3.ebuild,v 1.2 2006/12/10 20:48:12 ticho Exp $
 
 inherit eutils
 
@@ -111,12 +111,6 @@ src_install() {
 		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(dnsdomainname)';:" \
 			/etc/amavisd.conf
 	fi
-	if ! $(has_version mail-filter/spamassassin) ; then
-		einfo "Disabling anti-spam code in amavisd.conf..."
-
-		dosed "s:^#[\t ]*@bypass_spam_checks_maps[\t ]*=[\t ]*(1);:\@bypass_spam_checks_maps = (1);:" \
-			/etc/amavisd.conf
-	fi
 
 	newinitd "${FILESDIR}/amavisd.rc6" amavisd
 	dosed "s:/var/run/amavis/:$AMAVIS_ROOT/:g" /etc/init.d/amavisd