Date: Mon, 22 Dec 2014 21:11:08 +0200
From: Johan Dahlberg <johan@dnix.se>
To: alpine-devel@lists.alpinelinux.org
Subject: Re: [alpine-devel] SpamAssassin DNSBL tests fail after changes in
 perl (patch included)
Message-ID: <20141222191107.GA3763@einstein.local>
References: <20141217094939.GA7838@einstein.local>
 <1419264733.22778.8.camel@df1844j>
 <20141222170528.GA1926@einstein.local>
Content-Type: multipart/signed; micalg=pgp-sha256;
	protocol="application/pgp-signature"; boundary="gj572EiMnwbLXET9"
Content-Disposition: inline
In-Reply-To: <20141222170528.GA1926@einstein.local>
User-Agent: Mutt/1.5.23 (2014-03-12)
Precedence: list


--gj572EiMnwbLXET9
Content-Type: multipart/mixed; boundary="qDbXVdCdHGoSgWSk"
Content-Disposition: inline


--qDbXVdCdHGoSgWSk
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

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->nameserve=
rs
> > > +                                                 :
> > > @{$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 attached
> patch is correct.
>=20
> Johan

> diff --git a/lib/Mail/SpamAssassin/DnsResolver.pm.orig b/lib/Mail/SpamAss=
assin/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->nameservers
> +                                                 : @{$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_p=
ort));
>    }
>    return @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

--qDbXVdCdHGoSgWSk
Content-Type: text/x-diff; charset=utf-8
Content-Disposition: attachment; filename="sa-fix-dns.patch"
Content-Transfer-Encoding: quoted-printable

---
 lib/Mail/SpamAssassin/DnsResolver.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/Mail/SpamAssassin/DnsResolver.pm b/lib/Mail/SpamAssassin/D=
nsResolver.pm
index 41ae81c..fdc1e5e 100644
--- a/lib/Mail/SpamAssassin/DnsResolver.pm
+++ 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.co=
nf
-    @ns_addr_port =3D map(untaint_var("[$_]:" . $res->{port}),
-                        @{$res->{nameservers}});
+    my @ns =3D $res->UNIVERSAL::can('nameservers') ? $res->nameservers
+                                                 : @{$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_por=
t));
   }
   return @ns_addr_port;
--=20
2.2.1


--qDbXVdCdHGoSgWSk--

--gj572EiMnwbLXET9
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAABCAAGBQJUmGzLAAoJEAcoCTcJhy3fXpcP/1PP+se+AdndxxRruyQPPIk6
39Vb1x3TO8yAcVdEr089DPLUz6OeWPmk9+26VSrBP8xvmQz1A6UFSZ4OJ3mkYtsc
DysXmNi+szqVIBBHANgdygPG1r00PxCpqLKT1rHW76GhMwSpB4Oj8DPj23I6HuGC
UBYpfb2FXpnNCwytkFr13u/L7SBuCeM2uRNbA5pEehL8R7Uk/nyAhDCX/+n97/Kp
xc0m2jH1zjYlRc+xXeUdpgp1idxbxSXO+msM/PgLCx7Eh53s8gYOo+sXD7fCxwFC
gxwrGq8LaqQJcIoThYkwrc5PUeGDOeqK9y36X8HtEnTt0RLIzh2jyWBBe9TQhKMu
kw5T69MjAbI9rYlMQ+Ky2p2F05PV1D0uNZc/oVrhjOqRWk5kAcwTfzWy2l+8chmj
t80BTZlIFOeXMmjPV4racymsYMpQHJt43y+PXlplJeAE852OOpAi9O4FBoldu5ZW
O2qvfZV5vGEOtWTxCPAHL/xQNyKv8Qz6yIC8KwVTIKrTpZeXBrKEtL31f8SUuFRf
3oXpftmaKO2GU1AENrvHqAOnJQ0qN/BVXqKdtauoVXiwsVu+PyKzyXVAVVI00AcY
U0jSnAOT+ecOBljDj0J6LT4A4vhVp8qgw41jbBKr/A8TAyCPcVPdk2ZG+0a84YQv
0D9MfYMXDEhcMhseqYVw
=wi/Y
-----END PGP SIGNATURE-----

--gj572EiMnwbLXET9--


---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---