From: Jeremy Olexa <darkside@gentoo.org>
Date: Thu, 29 Apr 2010 21:17:34 +0000 (+0000)
Subject: Revision bump to add warning about importing new key, bug 313809. Patch by David... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1e9950e76223a1d116cfec691d9bc39c37dbdd74;p=gentoo.git

Revision bump to add warning about importing new key, bug 313809. Patch by David Abbott
Package-Manager: portage-2.1.8.3/cvs/Linux armv7l
---

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/Manifest b/mail-filter/spamassassin/Manifest
index 8b12f4e61f70..9702274502f9 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -9,6 +9,6 @@ DIST Mail-SpamAssassin-3.2.5.tar.bz2 1011883 RMD160 444baab6d966d4366834b82cde34
 DIST Mail-SpamAssassin-3.3.1.tar.bz2 1015008 RMD160 b681fc60292cd30efd405585aad70f39c9633260 SHA1 f5748043eb286b1acb456093039a55db00c6f25e SHA256 4c348cd951fc2c5688e9713fcbc6ba453df51d32a1ab332a63800d20ff18bdb4
 EBUILD spamassassin-3.2.1-r2.ebuild 8050 RMD160 7f275770c6a20e6a68fdf04757be5db88a72b929 SHA1 918ec7a51eb35f79e1d9f73a50b7d3bedb1d7fd1 SHA256 1671f927661a80b047a1d4afddee2726a1f30d577950c3799531f36771f916e8
 EBUILD spamassassin-3.2.5-r2.ebuild 8061 RMD160 2c481a42ebdb881a308a81cf4abc9bfe6d976a5f SHA1 fd0374b921595713cf3ccd79c609896496575859 SHA256 ce37c7bfc36126f21b92f3ea033c9f04369a046e57942f1e535dc316a05aca71
-EBUILD spamassassin-3.3.1-r1.ebuild 6279 RMD160 843367375cd2e3413e6b3fcff8f65b247055fb84 SHA1 4857138e84b2cbdca565fdd3a630b32b67d659f5 SHA256 aea273dcc856af80b92d1f8d28308f24d6fb3f24922280267e2fe7812b256d17
-MISC ChangeLog 36984 RMD160 7959a213a661e594a67b9c0ad03fc323f5602775 SHA1 c0fb7b04fd455b341668d6ea461c305ad25a5788 SHA256 c693ae6737f72d3b48a5f4379500880a10a22e7d37618b975064b2859c28ee9e
+EBUILD spamassassin-3.3.1-r2.ebuild 6460 RMD160 ac2375a377132dbec3607409f51193a61363ebab SHA1 90fe1f7bca46eb3e9d5857f490b12dda7132c15f SHA256 b153a46e2e992fec418eec0bf89f0e1a7c8297b0fc009fe1e76d1d697631c99f
+MISC ChangeLog 37229 RMD160 330fbe22731dee6a7337a9cfe0b8032bb2ed7b5d SHA1 470fd4c3617f6e091eb16cda3906f8ccb6f4e866 SHA256 a3ba30ba3fe724472b4181ed8b13df85680b5b36ba68ca5d8ebfb2d5d65e491b
 MISC metadata.xml 397 RMD160 57fce2ddbc573f348530f856bc0735ba1aae08b9 SHA1 ffab343d82e13c81c74ecb9d0724634a4df755d8 SHA256 6b960f56b7be9f2ecb4b7023b54e20fc6d5583d8ff9ea0b1a4a987c6d86b0a0a
diff --git a/mail-filter/spamassassin/spamassassin-3.3.1-r1.ebuild b/mail-filter/spamassassin/spamassassin-3.3.1-r2.ebuild
similarity index 95%
rename from mail-filter/spamassassin/spamassassin-3.3.1-r1.ebuild
rename to 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"
 }