Thu Aug 1 12:51:54 2013 UTC ()
Pullup ticket #4195 - requested by bouyer
mail/spamassassin: bug fix patch
Revisions pulled up:
- mail/spamassassin/Makefile 1.109
- mail/spamassassin/distinfo 1.60 via patch
- mail/spamassassin/patches/patch-sa-update 1.1
---
Module Name: pkgsrc
Committed By: bouyer
Date: Thu Aug 1 10:29:00 UTC 2013
Modified Files:
pkgsrc/mail/spamassassin: Makefile distinfo
Added Files:
pkgsrc/mail/spamassassin/patches: patch-sa-update
Log Message:
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
(tron)
diff -r1.107 -r1.107.2.1 pkgsrc/mail/spamassassin/Makefile
diff -r1.58 -r1.58.4.1 pkgsrc/mail/spamassassin/distinfo
diff -r0 -r1.1.2.2 pkgsrc/mail/spamassassin/patches/patch-sa-update
--- pkgsrc/mail/spamassassin/Makefile 2013/05/31 12:41:21 1.107
+++ pkgsrc/mail/spamassassin/Makefile 2013/08/01 12:51:53 1.107.2.1
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.107 2013/05/31 12:41:21 wiz Exp $
+# $NetBSD: Makefile,v 1.107.2.1 2013/08/01 12:51:53 tron Exp $
DISTNAME= Mail-SpamAssassin-3.3.2
PKGNAME= spamassassin-3.3.2
-PKGREVISION= 4
+PKGREVISION= 5
SVR4_PKGNAME= sa
CATEGORIES= mail perl5
MASTER_SITES= ${MASTER_SITE_APACHE:=spamassassin/source/}
--- pkgsrc/mail/spamassassin/distinfo 2013/02/25 18:41:45 1.58
+++ pkgsrc/mail/spamassassin/distinfo 2013/08/01 12:51:53 1.58.4.1
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.58 2013/02/25 18:41:45 gdt Exp $
+$NetBSD: distinfo,v 1.58.4.1 2013/08/01 12:51:53 tron Exp $
SHA1 (Mail-SpamAssassin-3.3.2.tar.gz) = de954f69e190496eff4a796a9bab61747f03072b
RMD160 (Mail-SpamAssassin-3.3.2.tar.gz) = 78e22ba6ba62a48fb7d24c40170124881b975fd9
@@ -17,3 +17,4 @@
SHA1 (patch-ae) = d46b1d8f56c8c61936c307f74b39a49da1b1f353
SHA1 (patch-aq) = 3a273c7742275647c2334382fed29c0ea33dfbd8
SHA1 (patch-ay) = ca8ea0b1e6d8fddd29d6ae960e1bf6e534d2f424
+SHA1 (patch-sa-update) = 893d8c2ebe68524b620a438f30e2b9ba764aaa6e
$NetBSD: patch-sa-update,v 1.1.2.2 2013/08/01 12:51:54 tron 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 {