Update sa-update PGP key to fix GnuGP 1.4.9 "cross-certified" error (see

http://wiki.apache.org/spamassassin/SaUpdateKeyNotCrossCertified).  Bump
PKGREVISION.  Ok with pkgsrc-security.

3 files changed, 45 insertions, 3 deletions

diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 12c82f084d6..3d5abcb69cc 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.86 2008/01/18 05:08:30 tnn Exp $
+# $NetBSD: Makefile,v 1.87 2008/05/20 05:42:46 ghen Exp $
 
 DISTNAME=	Mail-SpamAssassin-3.2.4
 PKGNAME=	spamassassin-3.2.4
-PKGREVISION=	1
+PKGREVISION=	2
 SVR4_PKGNAME=	sa
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_APACHE:=spamassassin/source/}
diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo
index 52515374f28..da2f997cc93 100644
--- a/mail/spamassassin/distinfo
+++ b/mail/spamassassin/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.47 2008/01/09 15:55:51 heinz Exp $
+$NetBSD: distinfo,v 1.48 2008/05/20 05:42:46 ghen Exp $
 
 SHA1 (Mail-SpamAssassin-3.2.4.tar.gz) = 5c0e01831256518b27139507a4ded38e582d8649
 RMD160 (Mail-SpamAssassin-3.2.4.tar.gz) = 00ebd0dfa544079524bbb0918cc21b644b26ecff
@@ -9,3 +9,4 @@ SHA1 (patch-aq) = 3a273c7742275647c2334382fed29c0ea33dfbd8
 SHA1 (patch-ay) = 7d805e7ef86e279a19e7d3d2f03e2227624317f8
 SHA1 (patch-ba) = ea6b8eac3d9475641725dc4aa1e7a4d31912a044
 SHA1 (patch-bc) = d12de1f4d4cf3b475275d15b3b8edc37e3b05405
+SHA1 (patch-bd) = eeeef0000912bd39ff6d943729e8c68bc31225bb
diff --git a/mail/spamassassin/patches/patch-bd b/mail/spamassassin/patches/patch-bd
new file mode 100644
index 00000000000..f63f05d2227
--- /dev/null
+++ b/mail/spamassassin/patches/patch-bd
@@ -0,0 +1,41 @@
+$NetBSD: patch-bd,v 1.1 2008/05/20 05:42:46 ghen Exp $
+
+Updated sa-update PGP key to fix GnuGP 1.4.9 "cross-certified" error,
+see http://wiki.apache.org/spamassassin/SaUpdateKeyNotCrossCertified
+
+--- rules/sa-update-pubkey.txt.orig	2008-01-05 22:11:39.000000000 +0100
++++ rules/sa-update-pubkey.txt
+@@ -52,8 +52,31 @@ NvzB1i9yubAMrsTQVu1Q8e5LsnL/MNYKb6oEJbBy
+ VNqX9f7jlybpLZW/n8cQ2r1ax19v7FleO/xSGvkYm7B1+4BW0mjy6A5dta5+e5WG
+ D5R06Uya3/xRAPGdmV6t4Mw8fFsuyCvs+vC73PR3+eS1UvCYsDpcQD8KpVBnsHaA
+ duWRKKhjuFL0vdOWAr25tFOTKAj5Ywas47PBukO0isov2WBCA1rVqOr6FUvdP76y
+-mqHv/0E6/vnTLxFoNsu4Ce42nAQ/A/jR
+-=SY0J
++mqHv/0E6/vnTLxFoNsu4Ce42nAQ/A/jRiQQ+BBgBAgAJAhsCBQJHhbheAinBXSAE
++GQECAAYFAkOnbIoACgkQbFU5eCT0NM68MQ/8DvYqxRm3vP0Gwnr+63kzET8S+6vf
++gxOghnU+eMlqUeUu/ajqnVDMzoAIRDw9QgQc9ZZoklOSJQwOuloAbdpL4TwQ2XfJ
++MLU60JkZWnEOXJwClb0qG1GqtcBPbMEUPfZcQfphdRL3jpWZlaexFiJRSD+A0riw
++7q3NZKPDt4FrF7F3GY9krFy+P0nRt5f462DeDhCYZgguBQH+oGtjc5Hx+kOVWDsS
++txo5xkt4/0DG50ZklPkTlCohmJwRLACy+NswdQ9q83eWAhzKOPgkal7xF6a+LyE+
++ytVYy2EgEU74r2gVw5iizy92FDj//Z2QAUyf/c4BMuAhvfwVIHd8n2DPHvpMP15L
++6fwoymh0OjzmhwK94Z2u1YqNC1CK27/hfB6okQ/Tct7/Ik61dBjtiYdUC9tTA5Ze
++W8X5ouSmttS1QFixx+Z4hiXV7Qj12lgVKuJohjrVshfcbVzTHljjAo3YkOZIHIoA
++IJTUMRNzTIx9k4hrPVbxbVQhKjKTwFNtBuxvmptGTcLEIv9THpqlq8jkcStJ2Zrd
++hhofPCWRT/Kzo+WE+Kgefv88T5Li7Ku12U/UpiK85+6nRspXj3rnkfDOUbLZjGM+
++1NET0xQTPuyxN6CXF7MMxfGCpszCudYxMANDQqNXu9brcPN/+EIxGRjqin4E7q+h
++kYUaY7Ki8mXtJ8cJEEBWphpSROxFktcQALWQv996bFq1iFcGuQ0ITxNDlOWCsses
++bgEM5zR10DH+6s2bXEO8xyDHQJtrvdCPetRDosnuOToBMnGMXTYVytnWzwwAzwq1
++YM+bGAeTHaIX+2UmxwFyX4GMOdqsNB+xDZ8pmRKjamJSgUQt6e18YpZlg1Y4QkxS
++Vptq7OZBjiKeLUhLhGJ6GWgEIedLcoCtFzKCfz3zwn0Oxl+1EnVu8yqN+quWTf8P
++7EZn+0ztqZY059BrcK2jmOyXvtOZBcAHXCUknh/uPHwAJV2WFWSNid2kNiLOrV+J
++3eLTs5sF9wNhxWRhl6/10cwTzjy0Onv5cJh2tjdwksigMRMwz4c839zXORni/tnY
+++IY22kNTKu84gB8rBuqUq8MQXNdS3bbROwwNUzpC0D1C1z1fBvyXDL1EwJdz70Wc
++2m/Sw6tIid5g98+XMW+Ibt43Jk2XbK71JLhbVbePbAcHVh/UXEtnjhRfX7oyWlwS
++a+lkKMiJd/6CQ6bvYsgklE7uEzTpRskpkkOcCk1O+8jfl+DsDwKrvVaNu8tpx45k
++TtV4JDA6iEHKakD/zZdVTR79W2CFqBvRfRikc5INOl1OfMQ4ODmjkMl3yI9wrHwS
++SQQxdq2XsS7xbU9HDFBEguQDu0rfzILZ9DuKIVHyr/CsRoJ5joj+JvKaUQC81ywQ
++aB8EKy5bg4U6
++=IbYW
+ -----END PGP PUBLIC KEY BLOCK-----
+ 
+