Attachment 143950 Details for Bug 191101 – diff for mail/spamassassin

[patch] diff for mail/spamassassin

spamassassin.diff (text/plain), 1.71 KB, created by Kurt Jaeger on 2014-06-20 08:14:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Jaeger

Created: 2014-06-20 08:14:21 UTC

Size: 1.71 KB

patch

obsolete

>diff -r -u -N mail/spamassassin/Makefile /usr/home/pi/myp/mail/spamassassin/Makefile
>--- mail/spamassassin/Makefile	2014-05-02 21:25:58.000000000 +0200
>+++ /usr/home/pi/myp/mail/spamassassin/Makefile	2014-06-20 10:09:58.000000000 +0200
>@@ -3,7 +3,7 @@
> 
> PORTNAME=		spamassassin
> PORTVERSION=	3.4.0
>-PORTREVISION?=	10		# also bump japanese/spamassassin
>+PORTREVISION?=	11		# also bump japanese/spamassassin
> CATEGORIES?=	mail perl5
> MASTER_SITES=	${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
> MASTER_SITE_SUBDIR=	spamassassin/source/:apache Mail/:cpan
>diff -r -u -N mail/spamassassin/files/patch-DnsResolver /usr/home/pi/myp/mail/spamassassin/files/patch-DnsResolver
>--- mail/spamassassin/files/patch-DnsResolver	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/home/pi/myp/mail/spamassassin/files/patch-DnsResolver	2014-06-20 10:04:49.000000000 +0200
>@@ -0,0 +1,15 @@
>+--- lib/Mail/SpamAssassin/DnsResolver.pm-orig	2014-06-20 10:02:34.000000000 +0200
>++++ lib/Mail/SpamAssassin/DnsResolver.pm	2014-06-20 10:04:20.000000000 +0200
>+@@ -204,8 +204,10 @@
>+     @ns_addr_port = @{$self->{conf}->{dns_servers}};
>+     dbg("dns: servers set by config to: %s", join(', ',@ns_addr_port));
>+   } elsif ($res) {  # default as provided by Net::DNS, e.g. /etc/resolv.conf
>+-    @ns_addr_port = map(untaint_var("[$_]:" . $res->{port}),
>+-                        @{$res->{nameservers}});
>++    my @ns = $res->UNIVERSAL::can('nameservers') ? $res->nameservers
>++						 : @{$res->{nameservers}};
>++    my $port = $res->UNIVERSAL::can('port') ? $res->port : $res->{port};
>++    @ns_addr_port = map(untaint_var("[$_]:" . $port), @ns);
>+     dbg("dns: servers obtained from Net::DNS : %s", join(', ',@ns_addr_port));
>+   }
>+   return @ns_addr_port;

Actions: View | Diff

Attachments on bug 191101: 143846 | 143950 | 143951