You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@spamassassin.apache.org by Mark Martinec <Ma...@ijs.si> on 2012/12/13 12:36:07 UTC

Re: sa-update don't update - FreeBSD ports patch

> Michael, could you please fold-in the above (or similar)
> patch to FreeBSD port mail/p5-Mail-SpamAssassin

Here is the 'patch-bug6872' patch file, suitable for inclusion
in the /usr/ports/mail/p5-Mail-SpamAssassin/files/
directory of FreeBSD ports:


--- sa-update.raw	(revision 1421187)
+++ sa-update.raw	(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 {



Mark

Re: sa-update don't update - FreeBSD ports patch

Posted by Виктор Белоус <v....@strelna.ru>.
Thanks, Mark

with this patch file after vi patch-bug6872, make clean, make, make 
deinstall, make install my sa-update works good

Dec 13 15:43:03.235 [83049] dbg: generic: unlinking user_prefs.template
Dec 13 15:43:03.236 [83049] dbg: diag: updates complete, exiting with code 0

Victor.

13.12.12 15:36, Mark Martinec пишет:
>> Michael, could you please fold-in the above (or similar)
>> patch to FreeBSD port mail/p5-Mail-SpamAssassin
> Here is the 'patch-bug6872' patch file, suitable for inclusion
> in the /usr/ports/mail/p5-Mail-SpamAssassin/files/
> directory of FreeBSD ports:
>
>
> --- sa-update.raw	(revision 1421187)
> +++ sa-update.raw	(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 {
>
>
>
> Mark