Thu Aug 1 10:29:00 2013 UTC ()
Add a patch from the svn repository (via
https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6872).
Fix sa-update with new p5-Net-DNS.
Bump PKGREVISION


(bouyer)
diff -r1.108 -r1.109 pkgsrc/mail/spamassassin/Makefile
diff -r1.59 -r1.60 pkgsrc/mail/spamassassin/distinfo
diff -r0 -r1.1 pkgsrc/mail/spamassassin/patches/patch-sa-update
cvs diff -r1.108 -r1.109 pkgsrc/mail/spamassassin/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/spamassassin/Makefile 2013/07/24 16:17:02 1.108
+++ pkgsrc/mail/spamassassin/Makefile 2013/08/01 10:29:00 1.109
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.108 2013/07/24 16:17:02 drochner Exp $ 1# $NetBSD: Makefile,v 1.109 2013/08/01 10:29:00 bouyer Exp $
2 2
3DISTNAME= Mail-SpamAssassin-3.3.2 3DISTNAME= Mail-SpamAssassin-3.3.2
4PKGNAME= spamassassin-3.3.2 4PKGNAME= spamassassin-3.3.2
5PKGREVISION= 4 5PKGREVISION= 5
6SVR4_PKGNAME= sa 6SVR4_PKGNAME= sa
7CATEGORIES= mail perl5 7CATEGORIES= mail perl5
8MASTER_SITES= ${MASTER_SITE_APACHE:=spamassassin/source/} 8MASTER_SITES= ${MASTER_SITE_APACHE:=spamassassin/source/}
9DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 9DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
10DISTFILES+= ${RULESARCHIVE} 10DISTFILES+= ${RULESARCHIVE}
11DISTFILES+= ${RULESARCHIVEASC} 11DISTFILES+= ${RULESARCHIVEASC}
12DISTFILES+= ${RULESARCHIVESHA} 12DISTFILES+= ${RULESARCHIVESHA}
13EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 13EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
14 14
15MAINTAINER= pkgsrc-users@NetBSD.org 15MAINTAINER= pkgsrc-users@NetBSD.org
16HOMEPAGE= http://spamassassin.apache.org/ 16HOMEPAGE= http://spamassassin.apache.org/
17COMMENT= Mail filter to identify spam 17COMMENT= Mail filter to identify spam
18LICENSE= apache-2.0 18LICENSE= apache-2.0
cvs diff -r1.59 -r1.60 pkgsrc/mail/spamassassin/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/spamassassin/distinfo 2013/07/24 16:17:02 1.59
+++ pkgsrc/mail/spamassassin/distinfo 2013/08/01 10:29:00 1.60
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1$NetBSD: distinfo,v 1.59 2013/07/24 16:17:02 drochner Exp $ 1$NetBSD: distinfo,v 1.60 2013/08/01 10:29:00 bouyer Exp $
2 2
3SHA1 (Mail-SpamAssassin-3.3.2.tar.gz) = de954f69e190496eff4a796a9bab61747f03072b 3SHA1 (Mail-SpamAssassin-3.3.2.tar.gz) = de954f69e190496eff4a796a9bab61747f03072b
4RMD160 (Mail-SpamAssassin-3.3.2.tar.gz) = 78e22ba6ba62a48fb7d24c40170124881b975fd9 4RMD160 (Mail-SpamAssassin-3.3.2.tar.gz) = 78e22ba6ba62a48fb7d24c40170124881b975fd9
5Size (Mail-SpamAssassin-3.3.2.tar.gz) = 1208182 bytes 5Size (Mail-SpamAssassin-3.3.2.tar.gz) = 1208182 bytes
6SHA1 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz) = a199d5f0f8c2381e3dfe421e7a774356b3ffda4b 6SHA1 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz) = a199d5f0f8c2381e3dfe421e7a774356b3ffda4b
7RMD160 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz) = 22843725705aca9a7c773d9cca50d6eb30ca295c 7RMD160 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz) = 22843725705aca9a7c773d9cca50d6eb30ca295c
8Size (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz) = 258995 bytes 8Size (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz) = 258995 bytes
9SHA1 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.asc) = 102cbd61d3d37243d17a48748fc468a1a4e91d05 9SHA1 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.asc) = 102cbd61d3d37243d17a48748fc468a1a4e91d05
10RMD160 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.asc) = 764ea0f583c370c3c11f7245005327afa6c19988 10RMD160 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.asc) = 764ea0f583c370c3c11f7245005327afa6c19988
11Size (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.asc) = 823 bytes 11Size (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.asc) = 823 bytes
12SHA1 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.sha1) = 13003cfad508bd45863e02711aaee041ab9bc30e 12SHA1 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.sha1) = 13003cfad508bd45863e02711aaee041ab9bc30e
13RMD160 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.sha1) = aa218d53eb3dda0737171f75d63b7a64f97c2930 13RMD160 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.sha1) = aa218d53eb3dda0737171f75d63b7a64f97c2930
14Size (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.sha1) = 88 bytes 14Size (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.sha1) = 88 bytes
15SHA1 (patch-aa) = 0fff97dee1153332471aeadc2b96c357d1925f5c 15SHA1 (patch-aa) = 0fff97dee1153332471aeadc2b96c357d1925f5c
16SHA1 (patch-ab) = 84ebc0f611365c00205a85cb84970772a0931ef8 16SHA1 (patch-ab) = 84ebc0f611365c00205a85cb84970772a0931ef8
17SHA1 (patch-ae) = d46b1d8f56c8c61936c307f74b39a49da1b1f353 17SHA1 (patch-ae) = d46b1d8f56c8c61936c307f74b39a49da1b1f353
18SHA1 (patch-aq) = 3a273c7742275647c2334382fed29c0ea33dfbd8 18SHA1 (patch-aq) = 3a273c7742275647c2334382fed29c0ea33dfbd8
19SHA1 (patch-ay) = ca8ea0b1e6d8fddd29d6ae960e1bf6e534d2f424 19SHA1 (patch-ay) = ca8ea0b1e6d8fddd29d6ae960e1bf6e534d2f424
20SHA1 (patch-ba) = 1842e3fc17b3d23309336e542635eeacb67461e8 20SHA1 (patch-ba) = 1842e3fc17b3d23309336e542635eeacb67461e8
 21SHA1 (patch-sa-update) = 893d8c2ebe68524b620a438f30e2b9ba764aaa6e
File Added: pkgsrc/mail/spamassassin/patches/patch-sa-update
$NetBSD: patch-sa-update,v 1.1 2013/08/01 10:29:00 bouyer Exp $

from https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6872,
fix for new Net::DNS

Index: sa-update.raw
===================================================================
--- sa-update.raw	(revision 1421187)
+++ sa-update	(working copy)
@@ -1136,9 +1136,11 @@
   if ($RR) {
     foreach my $rr ($RR->answer) {
       my $text = $rr->rdatastr;
-      local($1);
-      $text =~ /^"(.*)"$/;
-      push @result, $1;
+      if (defined $text && $text ne '') {
+        local($1);
+        $text =~ s/^"(.*)"\z/$1/s;
+        push(@result,$text);
+      }
     }
   }
   else {