summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Olexa <darkside@gentoo.org>2010-04-29 21:17:34 +0000
committerJeremy Olexa <darkside@gentoo.org>2010-04-29 21:17:34 +0000
commit3ce9c0039022031a8bbf32386bb838683c3b44ea (patch)
tree55f3764f15a2b5bd554dbab4a54ee520fc4879b6 /mail-filter
parentVersion bump (bug #311797). (diff)
downloadgentoo-2-3ce9c0039022031a8bbf32386bb838683c3b44ea.tar.gz
gentoo-2-3ce9c0039022031a8bbf32386bb838683c3b44ea.tar.bz2
gentoo-2-3ce9c0039022031a8bbf32386bb838683c3b44ea.zip
Revision bump to add warning about importing new key, bug 313809. Patch by David Abbott
(Portage version: 2.1.8.3/cvs/Linux armv7l)
Diffstat (limited to 'mail-filter')
-rw-r--r--mail-filter/spamassassin/ChangeLog9
-rw-r--r--mail-filter/spamassassin/spamassassin-3.3.1-r2.ebuild (renamed from mail-filter/spamassassin/spamassassin-3.3.1-r1.ebuild)10
2 files changed, 13 insertions, 6 deletions
diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog
index 442401bc3954..3abe144a3fe5 100644
--- a/mail-filter/spamassassin/ChangeLog
+++ b/mail-filter/spamassassin/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for mail-filter/spamassassin
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.177 2010/04/07 04:13:24 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.178 2010/04/29 21:17:34 darkside Exp $
+
+*spamassassin-3.3.1-r2 (29 Apr 2010)
+
+ 29 Apr 2010; Jeremy Olexa <darkside@gentoo.org>
+ -spamassassin-3.3.1-r1.ebuild, +spamassassin-3.3.1-r2.ebuild:
+ Revision bump to add warning about importing new key, bug 313809. Patch by
+ David Abbott
*spamassassin-3.3.1-r1 (07 Apr 2010)
diff --git a/mail-filter/spamassassin/spamassassin-3.3.1-r1.ebuild b/mail-filter/spamassassin/spamassassin-3.3.1-r2.ebuild
index 9e2c69303c54..cc24da6582d0 100644
--- a/mail-filter/spamassassin/spamassassin-3.3.1-r1.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.3.1-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.3.1-r1.ebuild,v 1.1 2010/04/07 04:13:24 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.3.1-r2.ebuild,v 1.1 2010/04/29 21:17:34 darkside Exp $
EAPI="2"
@@ -94,9 +94,6 @@ src_configure() {
}
src_compile() {
- mymake=""
- myinst=""
-
export PERL_MM_USE_DEFAULT=1
emake spamc/Makefile || die "emake failed"
@@ -193,5 +190,8 @@ pkg_postinst() {
ewarn "Rules are no longer included with SpamAssassin out of the box".
ewarn "You will need to immediately run sa-update, or download"
ewarn "the additional rules .tgz package and run sa-update --install"
- ewarn "with it, to get a ruleset."
+ ewarn "with it, to get a ruleset.\n"
+ elog "If when you run sa-update and receive a GPG validation error."
+ elog "Then you need to import an updated sa-update key."
+ elog "sa-update --import /usr/share/spamassassin/sa-update-pubkey.txt\n"
}