Date: Thu, 25 Dec 2014 13:32:48 +0200
From: Johan Dahlberg <johan@dnix.se>
To: Leonardo Arena <rnalrd@gmail.com>
Cc: alpine-devel@lists.alpinelinux.org
Subject: Re: [alpine-devel] SpamAssassin DNSBL tests fail after changes in
 perl (patch included)
Message-ID: <20141225113247.GA6302@einstein.local>
References: <20141217094939.GA7838@einstein.local>
 <1419264733.22778.8.camel@df1844j>
 <20141222170528.GA1926@einstein.local>
 <20141222191107.GA3763@einstein.local>
 <1419501308.23192.30.camel@df1844j>
Content-Type: multipart/signed; micalg=pgp-sha256;
	protocol="application/pgp-signature"; boundary="FCuugMFkClbJLl1L"
Content-Disposition: inline
In-Reply-To: <1419501308.23192.30.camel@df1844j>
User-Agent: Mutt/1.5.23 (2014-03-12)
Precedence: list


--FCuugMFkClbJLl1L
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, 25 Dec 2014 at 10:55:08, Leonardo Arena wrote:
> 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
> > > > > @@ -204,8 +204,10 @@
> > > > >      @ns_addr_port =3D @{$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 =3D map(untaint_var("[$_]:" . $res->{port}),
> > > > > -                        @{$res->{nameservers}});
> > > > > +    my @ns =3D $res->UNIVERSAL::can('nameservers') ? $res->names=
ervers
> > > > > +                                                 :
> > > > > @{$res->{nameservers}};
> > > > > +    my $port =3D $res->UNIVERSAL::can('port') ? $res->port :
> > > > > $res->{port};
> > > > > +    @ns_addr_port =3D map(untaint_var("[$_]:" . $port), @ns);
> > > > >      dbg("dns: servers obtained from Net::DNS : %s", join(',
> > > > > ',@ns_addr_port));
> > > > >    }
> > > > >    return @ns_addr_port;
> > > >=20
> > > >=20
> > > > Hi,
> > > > thanks for your contribution.
> > > > Would it be possible to have a GIT patch? It would be easier and 10=
0%
> > > > error-free to apply.
> > > > Thanks!
> > > >=20
> > > > R,
> > > > leo
> > >=20
> > > Hello, I'm not so used to working with git, but I think the attached
> > > patch is correct.
> > >=20
> > > Johan
> >=20
> > > diff --git a/lib/Mail/SpamAssassin/DnsResolver.pm.orig b/lib/Mail/Spa=
mAssassin/DnsResolver.pm
> > > index 41ae81c..fdc1e5e 100644
> > > --- a/lib/Mail/SpamAssassin/DnsResolver.pm.orig
> > > +++ b/lib/Mail/SpamAssassin/DnsResolver.pm
> > > @@ -204,8 +204,10 @@ sub configured_nameservers {
> > >      @ns_addr_port =3D @{$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/res=
olv.conf
> > > -    @ns_addr_port =3D map(untaint_var("[$_]:" . $res->{port}),
> > > -                        @{$res->{nameservers}});
> > > +    my @ns =3D $res->UNIVERSAL::can('nameservers') ? $res->nameserve=
rs
> > > +                                                 : @{$res->{nameserv=
ers}};
> > > +    my $port =3D $res->UNIVERSAL::can('port') ? $res->port : $res->{=
port};
> > > +    @ns_addr_port =3D map(untaint_var("[$_]:" . $port), @ns);
> > >      dbg("dns: servers obtained from Net::DNS : %s", join(', ',@ns_ad=
dr_port));
> > >    }
> > >    return @ns_addr_port;
> >=20
> >=20
> >=20
> >=20
> > I took some time to figure out git a bit so I guess the following
> > attached patch is more accurate(?).
> >=20
> > Regards,
> > Johan
>=20
> Thanks.
> I applied it to edge, can you please check that it works as expected?
> Then I can backport it to 3.1-stable.
>=20
> For future patches it would be nice to have a GIT patch against aports
> tree. It would be more straightforward to apply them.
> Thanks!
>=20
> - leo

I will test is as soon as the package shows up on the mirrors.

However I have a problem downloading your aports git, getting the
following several times now:

#> git clone http://git.alpinelinux.org/cgit/aports/

# Cloning into 'aports'...
# error: Unable to get pack file
# http://git.alpinelinux.org/cgit/aports/objects/pack/pack-1f504ab51e1954e7=
7d4841ca04d0a395bec1e1af.pack
# Recv failure: Connection timed out
# error: Unable to find e24b2cb6f0edf60b9bc766902715f25076ad591a under
# http://git.alpinelinux.org/cgit/aports
# Cannot obtain needed tree e24b2cb6f0edf60b9bc766902715f25076ad591a
# while processing commit 934775c391ac937f8c7a4f952cc7498df51abd7e.
# error: fetch failed.

It's temporary perhaps. Are there any mirrors?

If I have any future patches I will create them against the aports tree.

Regards,
Johan

--FCuugMFkClbJLl1L
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAABCAAGBQJUm/XfAAoJEAcoCTcJhy3fa8YQAIqApYX6uaTN8lbUkzlynqX1
dgILH5vpGKOeN4w1uJxJKTfuhIi9TCQQPzjGdNyhqxuaOB1cUwUeTLSQ5IymfJz0
7TneZU7dpWMpcGmkbZLl/REln0B9c86nDImVenADKEe4mPGCAP/R4ZbSq+Wmrmwd
mxQbCjezfE/X3m78YqUQvIZn5J1CcZUxKeVv3RyI8JaHdFB3bDwBUppCWi1DCCra
4BTRGqWoZJRdvQ0Ofp3B7XOOJ0kEu2kopgWoaM9TKybJ9JWC4l3MdbINtLe8EIdV
AmMnbS/K1nlXoOwbuWlnjnnQ7nHrUMUxeYWkWh8HCpaVNN2y6n1vOliZgUcFosdp
OTzXEHsEvnfx1BoDdQDJWT0G/bpdxxDJ0044zuF9lGGgZD+BQGr78tnt+UvvLjy9
VF6ByOFY3c3DLvm6Bi5ob4sBYxVvuGe/12unyhLxvGdIzi6b3FLKCfi11/po1e4/
f8rHBz7iVWPfq5w+DiX8sY+XzIDEGv2ti06jrkQtJDyqkjFYMqF0kzjKlEQCwbIT
yAr8rQo5gZ6OCZi+zHtea0dhZfqD1EYXMZ3vuuOsTuNsM21C0a4RpxxBQ9OhIrNW
/+sfL/NfMiG7ocoyjlkDUuRY8zx8IFJp6uJoAbfYaNmCcLnlkHQZFAUNh3EzDz+C
3LIoB7fUBLCMCSq8JoLt
=bk06
-----END PGP SIGNATURE-----

--FCuugMFkClbJLl1L--


---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---