Mail archive
alpine-devel

Re: [alpine-devel] SpamAssassin DNSBL tests fail after changes in perl (patch included)

From: Leonardo Arena <rnalrd_at_gmail.com>
Date: Thu, 25 Dec 2014 10:55:08 +0100

On lun, 2014-12-22 at 21:11 +0200, Johan Dahlberg wrote:
> On Mon, 22 Dec 2014 at 19:05:29, Johan Dahlberg wrote:
> > On Mon, 22 Dec 2014 at 17:12:13, Leonardo Arena wrote:
> > > On mer, 2014-12-17 at 11:49 +0200, Johan Dahlberg wrote:
> > > > --- SpamAssassin/DnsResolver.pm.bak
> > > > +++ SpamAssassin/DnsResolver.pm
> > > > _at_@ -204,8 +204,10 @@
> > > > _at_ns_addr_port = @{$self->{conf}->{dns_servers}};
> > > > dbg("dns: servers set by config to: %s", join(',
> > > > ',_at_ns_addr_port));
> > > > } elsif ($res) { # default as provided by Net::DNS, e.g.
> > > > /etc/resolv.conf
> > > > - _at_ns_addr_port = map(untaint_var("[$_]:" . $res->{port}),
> > > > - _at_{$res->{nameservers}});
> > > > + my _at_ns = $res->UNIVERSAL::can('nameservers') ? $res->nameservers
> > > > + :
> > > > _at_{$res->{nameservers}};
> > > > + my $port = $res->UNIVERSAL::can('port') ? $res->port :
> > > > $res->{port};
> > > > + _at_ns_addr_port = map(untaint_var("[$_]:" . $port), @ns);
> > > > dbg("dns: servers obtained from Net::DNS : %s", join(',
> > > > ',_at_ns_addr_port));
> > > > }
> > > > return _at_ns_addr_port;
> > >
> > >
> > > Hi,
> > > thanks for your contribution.
> > > Would it be possible to have a GIT patch? It would be easier and 100%
> > > error-free to apply.
> > > Thanks!
> > >
> > > R,
> > > leo
> >
> > Hello, I'm not so used to working with git, but I think the attached
> > patch is correct.
> >
> > Johan
>
> > diff --git a/lib/Mail/SpamAssassin/DnsResolver.pm.orig b/lib/Mail/SpamAssassin/DnsResolver.pm
> > index 41ae81c..fdc1e5e 100644
> > --- a/lib/Mail/SpamAssassin/DnsResolver.pm.orig
> > +++ b/lib/Mail/SpamAssassin/DnsResolver.pm
> > _at_@ -204,8 +204,10 @@ sub configured_nameservers {
> > _at_ns_addr_port = @{$self->{conf}->{dns_servers}};
> > dbg("dns: servers set by config to: %s", join(', ',_at_ns_addr_port));
> > } elsif ($res) { # default as provided by Net::DNS, e.g. /etc/resolv.conf
> > - _at_ns_addr_port = map(untaint_var("[$_]:" . $res->{port}),
> > - _at_{$res->{nameservers}});
> > + my _at_ns = $res->UNIVERSAL::can('nameservers') ? $res->nameservers
> > + : _at_{$res->{nameservers}};
> > + my $port = $res->UNIVERSAL::can('port') ? $res->port : $res->{port};
> > + _at_ns_addr_port = map(untaint_var("[$_]:" . $port), @ns);
> > dbg("dns: servers obtained from Net::DNS : %s", join(', ',_at_ns_addr_port));
> > }
> > return _at_ns_addr_port;
>
>
>
>
> I took some time to figure out git a bit so I guess the following
> attached patch is more accurate(?).
>
> Regards,
> Johan

Thanks.
I applied it to edge, can you please check that it works as expected?
Then I can backport it to 3.1-stable.

For future patches it would be nice to have a GIT patch against aports
tree. It would be more straightforward to apply them.
Thanks!

- leo





---
Unsubscribe:  alpine-devel+unsubscribe_at_lists.alpinelinux.org
Help:         alpine-devel+help_at_lists.alpinelinux.org
---
Received on Thu Dec 25 2014 - 10:55:08 GMT