diff options
| author |   Cory Visi <merlin@gentoo.org> | 2004-07-31 18:56:13 +0000 |
|---|---|---|
| committer | Cory Visi <merlin@gentoo.org> | 2004-07-31 18:56:13 +0000 |
| commit | 33968411a02a9f5928a619fec3944a14e19fb354 (patch) | |
| tree | 8f3edcaa1d2740d39e34c777bd51e977d30db5d4 /mail-filter/amavisd-new | |
| parent | Version Bump (Manifest recommit) (diff) | |
| download | gentoo-2-33968411a02a9f5928a619fec3944a14e19fb354.tar.gz gentoo-2-33968411a02a9f5928a619fec3944a14e19fb354.tar.bz2 gentoo-2-33968411a02a9f5928a619fec3944a14e19fb354.zip | |
keyword issues, and add SpamAssassin detection for Bug 58728
Diffstat (limited to 'mail-filter/amavisd-new')
| -rw-r--r-- | mail-filter/amavisd-new/ChangeLog | 7 | ||||
| -rw-r--r-- | mail-filter/amavisd-new/amavisd-new-20040701.ebuild | 18 |
2 files changed, 22 insertions, 3 deletions
diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog index cacd0254c61d..14f1066d9689 100644 --- a/mail-filter/amavisd-new/ChangeLog +++ b/mail-filter/amavisd-new/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for mail-filter/amavisd-new # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.9 2004/07/29 17:32:18 merlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.10 2004/07/31 18:56:13 merlin Exp $ + + 31 Jul 2004; Cory Visi <merlin@gentoo.org> amavisd-new-20040701.ebuild: + sparc and amd64 keywords were removed last commit; add back amd64 keyword as + the dependency on freeze is fixed, opened bug for sparc keyword; added + SpamAssassin detection logic to address Bug 58728 29 Jul 2004; Cory Visi <merlin@gentoo.org> files/amavisd.conf: Removed stray character from amavisd.conf, closing Bug 58697 diff --git a/mail-filter/amavisd-new/amavisd-new-20040701.ebuild b/mail-filter/amavisd-new/amavisd-new-20040701.ebuild index 868e15794320..6bbaaf7c605f 100644 --- a/mail-filter/amavisd-new/amavisd-new-20040701.ebuild +++ b/mail-filter/amavisd-new/amavisd-new-20040701.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-20040701.ebuild,v 1.2 2004/07/29 11:51:01 merlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-20040701.ebuild,v 1.3 2004/07/31 18:56:13 merlin Exp $ inherit eutils @@ -10,7 +10,7 @@ SRC_URI="http://www.ijs.si/software/amavisd/${PN}-${PV/_/-}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86 ~ppc" +KEYWORDS="~x86 ~ppc ~amd64" IUSE="ldap mysql postgres milter" DEPEND=">=sys-apps/sed-4 @@ -83,6 +83,12 @@ src_install() { dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(domainname)';:" \ /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 exeinto /etc/init.d newexe "${FILESDIR}/amavisd.rc6" amavisd @@ -125,6 +131,14 @@ pkg_postinst() { chown -R amavis:amavis ${ROOT}${AMAVIS_ROOT}/.razor fi + if ! `has_version mail-filter/spamassassin` ; then + echo + einfo "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking" + einfo "will be performed without it. Since you do not have SpamAssassin installed," + einfo "all spam checks have been disabled. To enable them, install SpamAssassin" + einfo "and comment out line 170 of /etc/amavisd.conf." + fi + echo ewarn ewarn "This version of amavisd-new has a different layout from previous versions" |