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>.

Package-Manager: portage-2.1.2_rc2-r5

7 files changed, 47 insertions, 60 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/Manifest b/mail-filter/amavisd-new/Manifest
index 7939aa5ccdb8..31a274a3c02f 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX amavisd-new-2.2.1-qmail-lf-workaround.patch 688 RMD160 45092cfb4180d5cac8abc38068105b619945dfe6 SHA1 5ab50c58bd125d545dd6a2081c3b4bc2892af7a2 SHA256 5e32e1fbcf172ce108ba1b494722894719ea31ed90d55610bffdb241246cfb57
 MD5 ee33de51df853bd8426a4304f264245f files/amavisd-new-2.2.1-qmail-lf-workaround.patch 688
 RMD160 45092cfb4180d5cac8abc38068105b619945dfe6 files/amavisd-new-2.2.1-qmail-lf-workaround.patch 688
@@ -30,30 +33,30 @@ DIST amavisd-new-2.3.3.tar.gz 772280 RMD160 c2213190582fe8fea9b8f1736e3b3e49b290
 DIST amavisd-new-2.4.1.tar.gz 841988 RMD160 edd91dde774838345159064ef6012f7927d5aa6c SHA1 1de9fdac377c58a29a93c8a246553c8e363b212c SHA256 c067cbae60ccff3932574fcaf7971c04b118f6b2e9fe6db772d33538b53b0a54
 DIST amavisd-new-2.4.2.tar.gz 854326 RMD160 fd82a0f3a1166d7f70846651b7b91af147b3fb70 SHA1 48893e23b03bb4ef493473b0f066e4f4d65ff1b7 SHA256 80023cc0397560d082dd4152c96b7efc49d3cc2695b4d578ed01b08c3af2bb9a
 DIST amavisd-new-2.4.3.tar.gz 876615 RMD160 9301d2ea30bd6a620d827384facc5a1bbace86db SHA1 d3b8b1a3c1707b120e9230821ba4ede449eed646 SHA256 ff71af590a0dc62bda558a037daceaea3b776d1ef7d0689ab0bfb582d436cf15
-EBUILD amavisd-new-2.3.3-r2.ebuild 5439 RMD160 5c17b187c77a9ff8f1a0cc06ff1720dedd3a9d15 SHA1 2713b2c9425561420e36b43ad6665fba8ea666b3 SHA256 7dff03f5cfc527411ccc6f0f6f3ba576ec164d8a4d65278ca7a0eb2679073e63
-MD5 c6394227a70a346f0a05e47efc57e9b6 amavisd-new-2.3.3-r2.ebuild 5439
-RMD160 5c17b187c77a9ff8f1a0cc06ff1720dedd3a9d15 amavisd-new-2.3.3-r2.ebuild 5439
-SHA256 7dff03f5cfc527411ccc6f0f6f3ba576ec164d8a4d65278ca7a0eb2679073e63 amavisd-new-2.3.3-r2.ebuild 5439
-EBUILD amavisd-new-2.4.1.ebuild 5328 RMD160 3b98db5e624d7f773e1fc3466f0f89188f331ae4 SHA1 491ab801dc6e35d4d653cc1dda11b91c0876195f SHA256 b7b1caffdb41d744c7d5113f8e1b533dd1187a598c281ab97bf670b68845eed1
-MD5 c258b0d2222a8a111e3ed0c6e140868e amavisd-new-2.4.1.ebuild 5328
-RMD160 3b98db5e624d7f773e1fc3466f0f89188f331ae4 amavisd-new-2.4.1.ebuild 5328
-SHA256 b7b1caffdb41d744c7d5113f8e1b533dd1187a598c281ab97bf670b68845eed1 amavisd-new-2.4.1.ebuild 5328
-EBUILD amavisd-new-2.4.2-r1.ebuild 5360 RMD160 4d3678e93cb51f1b13f8aef9bdf7820a7d492d89 SHA1 4c406adba6db1553095d56fd812a8cc080f64068 SHA256 a8ce0a9e35fa7afde1d21abf58567a9e1d3dda47a62141b1fd3d47aa97dfac91
-MD5 e08e99e2b3369d1ef701e75ad557edb5 amavisd-new-2.4.2-r1.ebuild 5360
-RMD160 4d3678e93cb51f1b13f8aef9bdf7820a7d492d89 amavisd-new-2.4.2-r1.ebuild 5360
-SHA256 a8ce0a9e35fa7afde1d21abf58567a9e1d3dda47a62141b1fd3d47aa97dfac91 amavisd-new-2.4.2-r1.ebuild 5360
-EBUILD amavisd-new-2.4.2.ebuild 5333 RMD160 f394a813c9e23545f98d9281d84a3304651f0179 SHA1 db015c7f7ec00cf6df5fb23ee7617af3dac919c1 SHA256 7a028b271fc65ca25bf220ca3327b24cd4db39b4b67b31ca1eac9f09f3a3edc2
-MD5 87106a13ab85dc81ff9778eca321005e amavisd-new-2.4.2.ebuild 5333
-RMD160 f394a813c9e23545f98d9281d84a3304651f0179 amavisd-new-2.4.2.ebuild 5333
-SHA256 7a028b271fc65ca25bf220ca3327b24cd4db39b4b67b31ca1eac9f09f3a3edc2 amavisd-new-2.4.2.ebuild 5333
-EBUILD amavisd-new-2.4.3.ebuild 5364 RMD160 f82341855106ddc386c6c3fa9f320c52753625e0 SHA1 15b04295f435c8d81c1673a8b831fcc9dd01d1c8 SHA256 a085936f8cc33b7545f3efb405bee0e70e3ff50425483c9c1914043812f64207
-MD5 caa4f3bbe8534dd99578e6d2405e0c6d amavisd-new-2.4.3.ebuild 5364
-RMD160 f82341855106ddc386c6c3fa9f320c52753625e0 amavisd-new-2.4.3.ebuild 5364
-SHA256 a085936f8cc33b7545f3efb405bee0e70e3ff50425483c9c1914043812f64207 amavisd-new-2.4.3.ebuild 5364
-MISC ChangeLog 19925 RMD160 5822897b8d82e28aa38217978dbe9897410c8384 SHA1 04a0375b0ddc7b7174c7ab11dba7a34174600a24 SHA256 fd65eac64ab983f5231e62dc633d59caa5b1b43b13e59d53305883d61518aaac
-MD5 e8c8abe8187ee164abf7c89aa0f49046 ChangeLog 19925
-RMD160 5822897b8d82e28aa38217978dbe9897410c8384 ChangeLog 19925
-SHA256 fd65eac64ab983f5231e62dc633d59caa5b1b43b13e59d53305883d61518aaac ChangeLog 19925
+EBUILD amavisd-new-2.3.3-r2.ebuild 5208 RMD160 58617a2670759a0e388f9bdc9bbb2911f1b8f648 SHA1 a7cd71f57ef0709f1b075e14379bdedd19327d93 SHA256 28cfcbc2ec5ee1192e23d63eefe9cea3443387a30471d5fc726f7face92609dc
+MD5 53c6dfa51a7d90c7b526160504cdb57e amavisd-new-2.3.3-r2.ebuild 5208
+RMD160 58617a2670759a0e388f9bdc9bbb2911f1b8f648 amavisd-new-2.3.3-r2.ebuild 5208
+SHA256 28cfcbc2ec5ee1192e23d63eefe9cea3443387a30471d5fc726f7face92609dc amavisd-new-2.3.3-r2.ebuild 5208
+EBUILD amavisd-new-2.4.1.ebuild 5096 RMD160 c913a7f8412abbc1a41e278787315e8be6645143 SHA1 e76bfd74ee669526bd45c46ef7fd7a1c38a774e0 SHA256 13dad1f5b7fe77785d1341810ca3c8a9f29e6d1f4553ea86ad3552538c1e3bd9
+MD5 47ac6b2493b8b672f3486c2dc15144aa amavisd-new-2.4.1.ebuild 5096
+RMD160 c913a7f8412abbc1a41e278787315e8be6645143 amavisd-new-2.4.1.ebuild 5096
+SHA256 13dad1f5b7fe77785d1341810ca3c8a9f29e6d1f4553ea86ad3552538c1e3bd9 amavisd-new-2.4.1.ebuild 5096
+EBUILD amavisd-new-2.4.2-r1.ebuild 5129 RMD160 f2e23774bd5db1032955730b2ef7b28ca0c504f2 SHA1 80a6f7110c85cc365842d3449c886f4eb261d4ea SHA256 c22d1f6e4a5eb3958f9927cdefa29ef91717c7af22e354d1e8ed3557153d07b4
+MD5 67ed04eda82f89e9d689df7546cc5376 amavisd-new-2.4.2-r1.ebuild 5129
+RMD160 f2e23774bd5db1032955730b2ef7b28ca0c504f2 amavisd-new-2.4.2-r1.ebuild 5129
+SHA256 c22d1f6e4a5eb3958f9927cdefa29ef91717c7af22e354d1e8ed3557153d07b4 amavisd-new-2.4.2-r1.ebuild 5129
+EBUILD amavisd-new-2.4.2.ebuild 5102 RMD160 8a4f073301d1554b0664791fd3ad6550f48e4de1 SHA1 feaf7eda582e2b7f8c748a10ef126a1e37c3412d SHA256 fb44bd9d00d06182c60ba393652a3750b7faf161738edbf30aca57858152d43f
+MD5 2edae2e214add8c61768934dc266a39e amavisd-new-2.4.2.ebuild 5102
+RMD160 8a4f073301d1554b0664791fd3ad6550f48e4de1 amavisd-new-2.4.2.ebuild 5102
+SHA256 fb44bd9d00d06182c60ba393652a3750b7faf161738edbf30aca57858152d43f amavisd-new-2.4.2.ebuild 5102
+EBUILD amavisd-new-2.4.3.ebuild 5133 RMD160 79ba46a33ad8b5cd0d240950b72b84f1d1d6feed SHA1 c16c0528f7460c6a977c0dcfa5160727eaf726a9 SHA256 3be17677141e51e919b988fcf300d844f188909f644621ae228a46f01920878d
+MD5 2485dfbe653652d133eb1cf0e3fd4cf9 amavisd-new-2.4.3.ebuild 5133
+RMD160 79ba46a33ad8b5cd0d240950b72b84f1d1d6feed amavisd-new-2.4.3.ebuild 5133
+SHA256 3be17677141e51e919b988fcf300d844f188909f644621ae228a46f01920878d amavisd-new-2.4.3.ebuild 5133
+MISC ChangeLog 20286 RMD160 dc6f2cdcc12ec3eb7dc762600bbbcf461408843c SHA1 e01ba947ae751e1c2f4ba8e64bdc65243a627f05 SHA256 157d6689a0c4ade6a76421ded05df7506cc463a32174b34821dde189d99a06b0
+MD5 fe05d128adacec56c88a975f42281fd2 ChangeLog 20286
+RMD160 dc6f2cdcc12ec3eb7dc762600bbbcf461408843c ChangeLog 20286
+SHA256 157d6689a0c4ade6a76421ded05df7506cc463a32174b34821dde189d99a06b0 ChangeLog 20286
 MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58
 MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 metadata.xml 184
@@ -73,3 +76,10 @@ SHA256 ff3807ede34c85941b47474b17954f8b97eacd86a8d45e4f8afb52190ee6cac1 files/di
 MD5 5797ce9567bd44923d8c5d17a8a93e83 files/digest-amavisd-new-2.4.3 253
 RMD160 8e6fe47433fb57841e16585dadcc0d6597f00f25 files/digest-amavisd-new-2.4.3 253
 SHA256 071e7e9667b41342dc744663935b714e0858ec0091901e993eaac59dc9822027 files/digest-amavisd-new-2.4.3 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFfHKYQlM6RnzZP+IRAq3hAJ44qJXb+1ImswH/uMQWLp8A1yjuQACfRRiU
+4QHQ2Vw8Qi5jh0i+1Agy8ZQ=
+=IlfA
+-----END PGP SIGNATURE-----
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