Message-ID: <1419509312.23192.33.camel@df1844j>
Subject: Re: [alpine-devel] SpamAssassin DNSBL tests fail after changes in
 perl (patch included)
From: Leonardo Arena <rnalrd@gmail.com>
To: Johan Dahlberg <johan@dnix.se>
Cc: alpine-devel@lists.alpinelinux.org
Date: Thu, 25 Dec 2014 13:08:32 +0100
In-Reply-To: <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>
	 <20141225113247.GA6302@einstein.local>
Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature";
	boundary="=-f/EEPgOsHrabz3ykkiV+"
Precedence: list
Mime-Version: 1.0


--=-f/EEPgOsHrabz3ykkiV+
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

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->nam=
eservers
> > > > > > +                                                 :
> > > > > > @{$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 =
100%
> > > > > error-free to apply.
> > > > > Thanks!
> > > > >=20
> > > > > R,
> > > > > leo
> > > >=20
> > > > Hello, I'm not so used to working with git, but I think the attache=
d
> > > > patch is correct.
> > > >=20
> > > > Johan
> > >=20
> > > > diff --git a/lib/Mail/SpamAssassin/DnsResolver.pm.orig b/lib/Mail/S=
pamAssassin/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_po=
rt));
> > > >    } elsif ($res) {  # default as provided by Net::DNS, e.g. /etc/r=
esolv.conf
> > > > -    @ns_addr_port =3D map(untaint_var("[$_]:" . $res->{port}),
> > > > -                        @{$res->{nameservers}});
> > > > +    my @ns =3D $res->UNIVERSAL::can('nameservers') ? $res->nameser=
vers
> > > > +                                                 : @{$res->{namese=
rvers}};
> > > > +    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
> > >=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-1f504ab51e1954=
e77d4841ca04d0a395bec1e1af.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?

May be is a web server issue. Have you tried
git://git.alpinelinux.org/cgit/aports/ ?


> If I have any future patches I will create them against the aports tree.

Thanks!


--=-f/EEPgOsHrabz3ykkiV+
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part
Content-Transfer-Encoding: 7bit

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQEcBAABAgAGBQJUm/5AAAoJELAPckZGG2T6SvUH/1Fjywb0Pihr0//8erOHTKXQ
lf366Vc1YiNHYjPqkPZxvZmV8PJXWkjlr7A2o+8KQQb23ua2HNapsUy+RbpJU+Nd
hQ3ZFuAqX9Rudqhul3CC7SeinrBSXiCsomfwvPqM2ASIE/gSfj2D9O+GOF2HfFMM
xk9E4bhEmeIAsiXxJxIRmk2DlDz7DMb7vj39KZCS9kP/MKYeasUR7jrkU1Osakp3
qZ9qNyWMq4AZCdaQvVVrWObBwOqwAEiAVbfe1exofddan+0CJ/jSQfPSKhGZ0+v2
9nhabfQYyr3DHtGXqz+oDr/CNFo5Vn6aPgEvqlOzPYEnIQt37USWzLv6Ad9vsPo=
=o836
-----END PGP SIGNATURE-----

--=-f/EEPgOsHrabz3ykkiV+--



---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---