Date: Fri, 26 Dec 2014 03:28:09 +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: <20141226012808.GA6116@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>
 <20141225113247.GA6302@einstein.local>
 <1419509312.23192.33.camel@df1844j>
Content-Type: multipart/signed; micalg=pgp-sha256;
	protocol="application/pgp-signature"; boundary="Dxnq1zWXvFF0Q93v"
Content-Disposition: inline
In-Reply-To: <1419509312.23192.33.camel@df1844j>
User-Agent: Mutt/1.5.23 (2014-03-12)
Precedence: list


--Dxnq1zWXvFF0Q93v
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, 25 Dec 2014 at 13:08:32, Leonardo Arena wrote:
> On gio, 2014-12-25 at 13:32 +0200, Johan Dahlberg wrote:
> > 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->n=
ameservers
> > > > > > > +                                                 :
> > > > > > > @{$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 an=
d 100%
> > > > > > error-free to apply.
> > > > > > Thanks!
> > > > > >=20
> > > > > > R,
> > > > > > leo
> > > > >=20
> > > > > Hello, I'm not so used to working with git, but I think the attac=
hed
> > > > > patch is correct.
> > > > >=20
> > > > > Johan
> > > >=20
> > > > > 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
> > > > > @@ -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=
/resolv.conf
> > > > > -    @ns_addr_port =3D map(untaint_var("[$_]:" . $res->{port}),
> > > > > -                        @{$res->{nameservers}});
> > > > > +    my @ns =3D $res->UNIVERSAL::can('nameservers') ? $res->names=
ervers
> > > > > +                                                 : @{$res->{name=
servers}};
> > > > > +    my $port =3D $res->UNIVERSAL::can('port') ? $res->port : $re=
s->{port};
> > > > > +    @ns_addr_port =3D map(untaint_var("[$_]:" . $port), @ns);
> > > > >      dbg("dns: servers obtained from Net::DNS : %s", join(', ',@n=
s_addr_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
> >=20
> > I will test is as soon as the package shows up on the mirrors.
> >=20
> > However I have a problem downloading your aports git, getting the
> > following several times now:
> >=20
> > #> git clone http://git.alpinelinux.org/cgit/aports/
> >=20
> > # Cloning into 'aports'...
> > # error: Unable to get pack file
> > # http://git.alpinelinux.org/cgit/aports/objects/pack/pack-1f504ab51e19=
54e77d4841ca04d0a395bec1e1af.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.
> >=20
> > It's temporary perhaps. Are there any mirrors?
>=20
> May be is a web server issue. Have you tried
> git://git.alpinelinux.org/cgit/aports/ ?
>=20
>=20
> > If I have any future patches I will create them against the aports tree.
>=20
> Thanks!
>=20

The patched spamassassin is working as expected.

DNSBL lookups and scoring are all accurate. So I think you can push this
to the main repo.

Regards,
Johan

--Dxnq1zWXvFF0Q93v
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAABCAAGBQJUnLmoAAoJEAcoCTcJhy3fLmoP/RnVjGDv/7EojXe07rl0k9xR
unhnxGcw4hwXEkieMd7vmCPMKNKkTt9nTkLULB2PQ0vd5GmSLxAnHATdKo+QD+za
V9s+BdFHZAUe+e7SUCSHx89Lee7vJyauvzDjSB2XQ9UMPwgfwG7PihlkXINUJYqB
x/C+d/mS/d4tzwksX4d3mU4/LP4OHfQcKMc2bAUa3X54iceUhsGFgGXdIpfb2G5B
/V8QOy1DsYvBCs2JEGOLx/XqrTZpWgvuZxMh+f8nSYkA/nZL11RPmRYScOMOxZtk
i8gaQpY+act9s7XhSTtQ8rezTBWq63L6Kys/uhIQs5+cvlyglDxva1dYyMB/1mqf
iXAm3x4rVa64YC8T276AbhE4cMzm/BKy6QcGHrILggC+RcMMgB24n1eDYoC5K78n
E5XTceWqIWImyhrSEBeL/12ZA452rZ9037T1QwGad8YjAKgqJq9Ff4t5+II5vFeZ
E4ha2KtTG6Fu49z1Z1RaQtz5l6wFcWNyyE5E1MWFA/sVHpS2HuriPhL60j2y0Uqf
KO3DPHjtXEljgAsLYt8LQ1SnfKZb/HNn8rhvaH417FDGYjAsVqBJzsF0DFmTouLv
QVlwpRA3uruqRlo1wRHMUpweqIXHEvDh7esuJSqiYQMJBYO/S2aO9BseQXQunjmu
C5j/RdWbvFkfm5mOsNXh
=XmIW
-----END PGP SIGNATURE-----

--Dxnq1zWXvFF0Q93v--


---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---