hollalinux
/
slackbuilds
mirror of https://github.com/SlackBuildsOrg/slackbuilds.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

network/spamassassin: Fix bug with dnsresolver. 

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
LukenShiro 2014-09-26 18:13:39 +07:00 committed by Willy Sudiarto Raharjo
parent 9d7d6d86ec
commit 02189e110f
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
network/spamassassin/patch-dnsresolver_3.4.0.diff Normal file
View File

@ -0,0 +1,14 @@
--- Mail/SpamAssassin/DnsResolver.pm.orig 2014-05-07 17:54:29 +0200
+++ Mail/SpamAssassin/DnsResolver.pm 2014-06-18 02:13:32 +0200
@@ -205,6 +205,8 @@
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));
}

8
network/spamassassin/spamassassin.SlackBuild
View File

@ -27,7 +27,7 @@
PRGNAM=spamassassin
VERSION=${VERSION:-3.4.0}
BUILD=${BUILD:-1}
BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@ -70,6 +70,12 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# patch for bug in DnsResolver.pm (thanks to Edgars for pointing it out)
# https://issues.apache.org/SpamAssassin/show_bug.cgi?id=7057
cd lib
patch -p0 < $CWD/patch-dnsresolver_3.4.0.diff
cd ..
echo "y" | perl Makefile.PL \
PREFIX=/usr \
INSTALLDIRS=vendor \