Attachment #143950 for bug #191101

Lines 3-9 Link Here

(-)/usr/home/pi/myp/mail/spamassassin/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= spamassassin	4	PORTNAME= spamassassin
5	PORTVERSION= 3.4.0	5	PORTVERSION= 3.4.0
6	PORTREVISION?= 10 # also bump japanese/spamassassin	6	PORTREVISION?= 11 # also bump japanese/spamassassin
7	CATEGORIES?= mail perl5	7	CATEGORIES?= mail perl5
8	MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}	8	MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
9	MASTER_SITE_SUBDIR= spamassassin/source/:apache Mail/:cpan	9	MASTER_SITE_SUBDIR= spamassassin/source/:apache Mail/:cpan




--- lib/Mail/SpamAssassin/DnsResolver.pm-orig	2014-06-20 10:02:34.000000000 +0200
+++ lib/Mail/SpamAssassin/DnsResolver.pm	2014-06-20 10:04:20.000000000 +0200
@@ -204,8 +204,10 @@
     @ns_addr_port = @{$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 = map(untaint_var("[$_]:" . $res->{port}),
-                        @{$res->{nameservers}});
+    my @ns = $res->UNIVERSAL::can('nameservers') ? $res->nameservers
+						 : @{$res->{nameservers}};
+    my $port = $res->UNIVERSAL::can('port') ? $res->port : $res->{port};
+    @ns_addr_port = map(untaint_var("[$_]:" . $port), @ns);
     dbg("dns: servers obtained from Net::DNS : %s", join(', ',@ns_addr_port));
   }
   return @ns_addr_port;

Return to bug 191101

Line 0 Link Here

(-)/usr/home/pi/myp/mail/spamassassin/files/patch-DnsResolver (+15 lines)
	1	--- lib/Mail/SpamAssassin/DnsResolver.pm-orig 2014-06-20 10:02:34.000000000 +0200
	2	+++ lib/Mail/SpamAssassin/DnsResolver.pm 2014-06-20 10:04:20.000000000 +0200
	3	@@ -204,8 +204,10 @@
	4	@ns_addr_port = @{$self->{conf}->{dns_servers}};
	5	dbg("dns: servers set by config to: %s", join(', ',@ns_addr_port));
	6	} elsif ($res) { # default as provided by Net::DNS, e.g. /etc/resolv.conf
	7	- @ns_addr_port = map(untaint_var("[$_]:" . $res->{port}),
	8	- @{$res->{nameservers}});
	9	+ my @ns = $res->UNIVERSAL::can('nameservers') ? $res->nameservers
	10	+ : @{$res->{nameservers}};
	11	+ my $port = $res->UNIVERSAL::can('port') ? $res->port : $res->{port};
	12	+ @ns_addr_port = map(untaint_var("[$_]:" . $port), @ns);
	13	dbg("dns: servers obtained from Net::DNS : %s", join(', ',@ns_addr_port));
	14	}
	15	return @ns_addr_port;