rpms/spamassassin
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Add patch to work with newer perl-Net-DNS. Fixes bug #1111586

Browse Source
This commit is contained in:
Kevin Fenzi 2014-06-20 19:57:32 -06:00
parent 17e48507ee
commit d7733b974d
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
spamassassin-3.4.0-net-dns.patch Normal file
View File

@ -0,0 +1,16 @@
diff -Nur Mail-SpamAssassin-3.4.0.orig/lib/Mail/SpamAssassin/DnsResolver.pm Mail-SpamAssassin-3.4.0/lib/Mail/SpamAssassin/DnsResolver.pm
--- Mail-SpamAssassin-3.4.0.orig/lib/Mail/SpamAssassin/DnsResolver.pm 2014-02-07 01:36:28.000000000 -0700
+++ Mail-SpamAssassin-3.4.0/lib/Mail/SpamAssassin/DnsResolver.pm 2014-06-20 11:53:04.688979753 -0600
@@ -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;

9
spamassassin.spec
View File

@ -69,7 +69,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents
Name: spamassassin
Version: 3.4.0
#Release: 0.8.%{prerev}%{?dist}
Release: 6%{?dist}
Release: 7%{?dist}
License: ASL 2.0
Group: Applications/Internet
URL: http://spamassassin.apache.org/
@ -97,6 +97,9 @@ Source15: spamassassin.sysconfig.el
# https://bugzilla.redhat.com/show_bug.cgi?id=1055593
# Switch to using gnupg2 instead of gnupg1
Patch0: spamassassin-3.3.2-gnupg2.patch
# https://bugzilla.redhat.com/1111586
# fix for newer perl-Net-DNS
Patch1: spamassassin-3.4.0-net-dns.patch
# Patches 100+ are SVN backports (DO NOT REUSE!)
# end of patches
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@ -176,6 +179,7 @@ To filter spam for all users, add that line to /etc/procmailrc
%setup -q -n Mail-SpamAssassin-%{version}
# Patches 0-99 are RH specific
%patch0 -p1
%patch1 -p1
# Patches 100+ are SVN backports (DO NOT REUSE!)
# end of patches
@ -370,6 +374,9 @@ fi
%endif
%changelog
* Fri Jun 20 2014 Kevin Fenzi <kevin@scrye.com> 3.4.0-7
- Add patch to work with newer perl-Net-DNS. Fixes bug #1111586
* Wed Jun 18 2014 Kevin Fenzi <kevin@scrye.com> 3.4.0-6
- Adjust systemd unit to not log to syslog since spamd does it already.
- Fixes bug #1107541