diff options
| author |   Andrej Kacian <ticho@gentoo.org> | 2005-06-01 22:29:23 +0000 |
|---|---|---|
| committer | Andrej Kacian <ticho@gentoo.org> | 2005-06-01 22:29:23 +0000 |
| commit | 313f1ffb877d172540a0f7cbd7d7e584cbd06a1c (patch) | |
| tree | 2e6ff04cd8a5b1afd216948951ae34e739ae7463 /mail-filter | |
| parent | Version bump #94736 by Peter Simons. (diff) | |
| download | gentoo-2-313f1ffb877d172540a0f7cbd7d7e584cbd06a1c.tar.gz gentoo-2-313f1ffb877d172540a0f7cbd7d7e584cbd06a1c.tar.bz2 gentoo-2-313f1ffb877d172540a0f7cbd7d7e584cbd06a1c.zip | |
Display a warning if <=spamassassin-3 is installed. Closes bug #94778.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'mail-filter')
| -rw-r--r-- | mail-filter/amavisd-new/ChangeLog | 7 | ||||
| -rw-r--r-- | mail-filter/amavisd-new/amavisd-new-2.3.0.ebuild | 10 | ||||
| -rw-r--r-- | mail-filter/amavisd-new/amavisd-new-2.3.1.ebuild | 10 |
3 files changed, 24 insertions, 3 deletions
diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog index f8658ed39fe8..aa21061a6207 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-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.44 2005/05/31 15:22:40 ticho Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.45 2005/06/01 22:29:23 ticho Exp $ + + 01 Jun 2005; Andrej Kacian <ticho@gentoo.org> amavisd-new-2.3.0.ebuild, + amavisd-new-2.3.1.ebuild: + Display a warning if <=spamassassin-3 is installed. Closes bug #94778, by + Christian Zuckschwerdt <zany@triq.net>. 31 May 2005; Andrej Kacian <ticho@gentoo.org> amavisd-new-2.3.0.ebuild: Stable on x86. diff --git a/mail-filter/amavisd-new/amavisd-new-2.3.0.ebuild b/mail-filter/amavisd-new/amavisd-new-2.3.0.ebuild index 0cf9189b4b7f..983bc602972d 100644 --- a/mail-filter/amavisd-new/amavisd-new-2.3.0.ebuild +++ b/mail-filter/amavisd-new/amavisd-new-2.3.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 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.0.ebuild,v 1.10 2005/05/31 15:22:40 ticho Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.3.0.ebuild,v 1.11 2005/06/01 22:29:23 ticho Exp $ inherit eutils @@ -53,6 +53,13 @@ RDEPEND="${DEPEND} AMAVIS_ROOT=/var/amavis src_unpack() { + if ! $(has_version ">=mail-filter/spamassassin-3.0.0") ; then + echo + ewarn "WARNING: Amavisd-new will not work with SpamAssassin older than 3.0.0." + ewarn " Consider upgrading your SpamAssassin installation." + ebeep 3 + sleep 5 + fi unpack ${A} cd ${S} if $(has_version mail-mta/courier) ; then @@ -166,6 +173,7 @@ pkg_postinst() { fi echo ewarn "Adjusting permissions for /etc/amavisd.conf (0 for world, owner root:amavis)" + echo chmod o-rwx /etc/amavisd.conf chown root:amavis /etc/amavisd.conf } diff --git a/mail-filter/amavisd-new/amavisd-new-2.3.1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.3.1.ebuild index 8d982e848bcd..ad54261c9810 100644 --- a/mail-filter/amavisd-new/amavisd-new-2.3.1.ebuild +++ b/mail-filter/amavisd-new/amavisd-new-2.3.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 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.1.ebuild,v 1.3 2005/05/25 15:28:10 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.3.1.ebuild,v 1.4 2005/06/01 22:29:23 ticho Exp $ inherit eutils @@ -52,6 +52,13 @@ RDEPEND="${DEPEND} AMAVIS_ROOT=/var/amavis src_unpack() { + if ! $(has_version ">=mail-filter/spamassassin-3.0.0") ; then + echo + ewarn "WARNING: Amavisd-new will not work with SpamAssassin older than 3.0.0." + ewarn " Consider upgrading your SpamAssassin installation." + ebeep 3 + sleep 5 + fi unpack ${A} cd ${S} if $(has_version mail-mta/courier) ; then @@ -165,6 +172,7 @@ pkg_postinst() { fi echo ewarn "Adjusting permissions for /etc/amavisd.conf (0 for world, owner root:amavis)" + echo chmod o-rwx /etc/amavisd.conf chown root:amavis /etc/amavisd.conf } |