From 7b25ab9336d3052f8a721ec5c50347e5b516a6b7 Mon Sep 17 00:00:00 2001 From: christos Date: Wed, 9 Sep 2015 19:13:48 +0000 Subject: update to 3.4.1: - improved automation to help combat spammers that are abusing new top level domains; - tweaks to the SPF support to block more spoofed emails; - increased character set normalization to make rules easier to develop and stop spammers from using alternate character sets to bypass tests; - continued refinement to the native IPv6 support; and - improved Bayesian classification with better debugging and attachment hashing. --- mail/spamassassin/Makefile | 30 +++---- mail/spamassassin/PLIST | 4 +- mail/spamassassin/distinfo | 25 +++--- mail/spamassassin/patches/patch-Makefile.PL | 33 ++++---- mail/spamassassin/patches/patch-README | 91 ++++++++++++++++++++++ mail/spamassassin/patches/patch-aq | 91 ---------------------- .../patch-lib_Mail_SpamAssassin_DnsResolver.pm | 23 ------ 7 files changed, 134 insertions(+), 163 deletions(-) create mode 100644 mail/spamassassin/patches/patch-README delete mode 100644 mail/spamassassin/patches/patch-aq delete mode 100644 mail/spamassassin/patches/patch-lib_Mail_SpamAssassin_DnsResolver.pm (limited to 'mail/spamassassin') diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile index 76edbe358c2..e99d9afdbef 100644 --- a/mail/spamassassin/Makefile +++ b/mail/spamassassin/Makefile @@ -1,14 +1,14 @@ -# $NetBSD: Makefile,v 1.120 2015/07/12 18:56:25 wiz Exp $ +# $NetBSD: Makefile,v 1.121 2015/09/09 19:13:48 christos Exp $ -DISTNAME= Mail-SpamAssassin-3.4.0 -PKGNAME= spamassassin-3.4.0 -PKGREVISION= 4 +DISTNAME= Mail-SpamAssassin-3.4.1 +PKGNAME= spamassassin-3.4.1 +#PKGREVISION= CATEGORIES= mail perl5 MASTER_SITES= ${MASTER_SITE_APACHE:=spamassassin/source/} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} DISTFILES+= ${RULESARCHIVE} -DISTFILES+= ${RULESARCHIVEASC} -DISTFILES+= ${RULESARCHIVESHA} +#DISTFILES+= ${RULESARCHIVEASC} +#DISTFILES+= ${RULESARCHIVESHA} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= pkgsrc-users@NetBSD.org @@ -18,13 +18,13 @@ LICENSE= apache-2.0 .include "../../mk/bsd.prefs.mk" -RULESARCHIVE= Mail-SpamAssassin-rules-3.4.0.r1565117.tgz -RULESARCHIVEASC=${RULESARCHIVE}.asc -RULESARCHIVESHA=${RULESARCHIVE}.sha1 +RULESARCHIVE= Mail-SpamAssassin-rules-3.4.1.r1675274.tgz +#RULESARCHIVEASC=${RULESARCHIVE}.asc +#RULESARCHIVESHA=${RULESARCHIVE}.sha1 FILES_SUBST+= RULESARCHIVE=${RULESDIR}/${RULESARCHIVE} PLIST_SUBST+= RULESARCHIVE=${RULESARCHIVE:Q} -PLIST_SUBST+= RULESARCHIVEASC=${RULESARCHIVEASC:Q} -PLIST_SUBST+= RULESARCHIVESHA=${RULESARCHIVESHA:Q} +#PLIST_SUBST+= RULESARCHIVEASC=${RULESARCHIVEASC:Q} +#PLIST_SUBST+= RULESARCHIVESHA=${RULESARCHIVESHA:Q} #DEPENDS+= {perl>=5.9.3,p5-Archive-Tar>=1.23}:../../archivers/p5-Archive-Tar #DEPENDS+= {perl>=5,p5-DB_File-[0-9]*}:../../databases/p5-DB_File @@ -199,10 +199,10 @@ post-install: ${INSTALL_DATA} ${FILESDIR}/netbsd_lists.cf ${DESTDIR}${EGDIR} ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${RULESARCHIVE} \ ${DESTDIR}${RULESDIR} - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${RULESARCHIVEASC} \ - ${DESTDIR}${RULESDIR} - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${RULESARCHIVESHA} \ - ${DESTDIR}${RULESDIR} +# ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${RULESARCHIVEASC} \ +# ${DESTDIR}${RULESDIR} +# ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${RULESARCHIVESHA} \ +# ${DESTDIR}${RULESDIR} # make sure we install the patched version of init.pre but can run the # tests with the original file diff --git a/mail/spamassassin/PLIST b/mail/spamassassin/PLIST index a4573943a30..b73c07b7a7e 100644 --- a/mail/spamassassin/PLIST +++ b/mail/spamassassin/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.22 2014/03/11 14:05:05 jperkin Exp $ +@comment $NetBSD: PLIST,v 1.23 2015/09/09 19:13:48 christos Exp $ @comment Most of this PLIST is auto-generated; see Makefile. share/examples/spamassassin/local.cf share/examples/spamassassin/netbsd_lists.cf @@ -7,5 +7,3 @@ share/spamassassin/languages share/spamassassin/sa-update-pubkey.txt share/spamassassin/user_prefs.template share/spamassassin/${RULESARCHIVE} -share/spamassassin/${RULESARCHIVEASC} -share/spamassassin/${RULESARCHIVESHA} diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo index de2706db36c..c2944b39fca 100644 --- a/mail/spamassassin/distinfo +++ b/mail/spamassassin/distinfo @@ -1,21 +1,14 @@ -$NetBSD: distinfo,v 1.64 2014/10/12 18:45:05 tron Exp $ +$NetBSD: distinfo,v 1.65 2015/09/09 19:13:48 christos Exp $ -SHA1 (Mail-SpamAssassin-3.4.0.tar.gz) = 4dac1384282b6201f7d80cea8295933ef08e7e28 -RMD160 (Mail-SpamAssassin-3.4.0.tar.gz) = c3a9b4adaebfe62c279684349ce76ed36d304f26 -Size (Mail-SpamAssassin-3.4.0.tar.gz) = 1269753 bytes -SHA1 (Mail-SpamAssassin-rules-3.4.0.r1565117.tgz) = d71a64cab9f5454d3b164e44d3649bff9cb87f87 -RMD160 (Mail-SpamAssassin-rules-3.4.0.r1565117.tgz) = fcf0bb481dee0fddc863ebab5772d6dbbde299f9 -Size (Mail-SpamAssassin-rules-3.4.0.r1565117.tgz) = 247283 bytes -SHA1 (Mail-SpamAssassin-rules-3.4.0.r1565117.tgz.asc) = 3a726149419ea2d23b28920582ac0921335966ac -RMD160 (Mail-SpamAssassin-rules-3.4.0.r1565117.tgz.asc) = 0db3057f2af1c4cf16f8eb48457553c81f769eec -Size (Mail-SpamAssassin-rules-3.4.0.r1565117.tgz.asc) = 823 bytes -SHA1 (Mail-SpamAssassin-rules-3.4.0.r1565117.tgz.sha1) = 9b4fc4c3b3dea74f0337c6b4c914943375616663 -RMD160 (Mail-SpamAssassin-rules-3.4.0.r1565117.tgz.sha1) = bab252971f0b1618ed5b28de9c377b10e54df169 -Size (Mail-SpamAssassin-rules-3.4.0.r1565117.tgz.sha1) = 85 bytes -SHA1 (patch-Makefile.PL) = 965e6aa223f2e714630db45131918485a5730c48 +SHA1 (Mail-SpamAssassin-3.4.1.tar.gz) = e7b342d30f4983f70f4234480b489ccc7d2aa615 +RMD160 (Mail-SpamAssassin-3.4.1.tar.gz) = 4b7d6a6def068eb015e8d4699db410ade76b28f3 +Size (Mail-SpamAssassin-3.4.1.tar.gz) = 3174888 bytes +SHA1 (Mail-SpamAssassin-rules-3.4.1.r1675274.tgz) = fcbcbf767f8c0b1b2ce2c3be4010cf6130f826b9 +RMD160 (Mail-SpamAssassin-rules-3.4.1.r1675274.tgz) = 7ed097fa0b8fddc43f73985f0474c45b497c0d95 +Size (Mail-SpamAssassin-rules-3.4.1.r1675274.tgz) = 270622 bytes +SHA1 (patch-Makefile.PL) = d322d7fb7286d5cf87ca775f9c381db32626e060 +SHA1 (patch-README) = 5d2aaecc4791e4f76df1078c17036cc23a39a8d0 SHA1 (patch-ae) = d46b1d8f56c8c61936c307f74b39a49da1b1f353 -SHA1 (patch-aq) = 3a273c7742275647c2334382fed29c0ea33dfbd8 -SHA1 (patch-lib_Mail_SpamAssassin_DnsResolver.pm) = 0ed96e5c35fdd1dacd27b4d29119206b1d3d1f58 SHA1 (patch-lib_Mail_SpamAssassin_Message.pm) = 402b9769df65ae87c3beebcc9441e29619eed367 SHA1 (patch-sa-compile) = e8a92060eefbc1c95b7b2c674fc69686a66f230b SHA1 (patch-sa-update) = 6ea354aa6b11740df1d25a807f5610115218294a diff --git a/mail/spamassassin/patches/patch-Makefile.PL b/mail/spamassassin/patches/patch-Makefile.PL index bdfcc8235b3..1f8e3cc6a15 100644 --- a/mail/spamassassin/patches/patch-Makefile.PL +++ b/mail/spamassassin/patches/patch-Makefile.PL @@ -1,13 +1,13 @@ -$NetBSD: patch-Makefile.PL,v 1.1 2014/04/26 13:55:10 tron Exp $ +$NetBSD: patch-Makefile.PL,v 1.2 2015/09/09 19:13:49 christos Exp $ - enable build of qmail-spamc - some files (local.cf, *.pre) are managed by pkgsrc, disable their installation. - pkgsrc creates B_DATADIR, so there is no need to re-set permissions ---- Makefile.PL.orig 2014-02-07 08:36:38.000000000 +0000 -+++ Makefile.PL 2014-04-26 11:11:54.000000000 +0100 -@@ -138,6 +138,7 @@ +--- Makefile.PL.orig 2015-04-28 15:57:01.000000000 -0400 ++++ Makefile.PL 2015-09-09 14:59:06.000000000 -0400 +@@ -133,6 +133,7 @@ 'spamassassin.raw' => 'spamassassin', 'sa-learn.raw' => 'sa-learn', 'sa-update.raw' => 'sa-update', @@ -15,7 +15,7 @@ $NetBSD: patch-Makefile.PL,v 1.1 2014/04/26 13:55:10 tron Exp $ 'sa-compile.raw' => 'sa-compile', 'sa-awl.raw' => 'sa-awl', 'sa-check_spamd.raw' => 'sa-check_spamd', -@@ -1098,19 +1099,21 @@ +@@ -1093,21 +1094,23 @@ conf__install: -$(MKPATH) $(B_CONFDIR) @@ -26,22 +26,25 @@ $NetBSD: patch-Makefile.PL,v 1.1 2014/04/26 13:55:10 tron Exp $ - $(PERL) -MFile::Copy -e "copy(q{rules/v320.pre}, q{$(B_CONFDIR)/v320.pre}) unless -f q{$(B_CONFDIR)/v320.pre}" - $(PERL) -MFile::Copy -e "copy(q{rules/v330.pre}, q{$(B_CONFDIR)/v330.pre}) unless -f q{$(B_CONFDIR)/v330.pre}" - $(PERL) -MFile::Copy -e "copy(q{rules/v340.pre}, q{$(B_CONFDIR)/v340.pre}) unless -f q{$(B_CONFDIR)/v340.pre}" -+ @ # manage local.cf and *.pre through pkgsrc .mk files -+ @ # $(PERL) -MFile::Copy -e "copy(q{rules/local.cf}, q{$(B_CONFDIR)/local.cf}) unless -f q{$(B_CONFDIR)/local.cf}" -+ @ # $(PERL) -MFile::Copy -e "copy(q{rules/init.pre}, q{$(B_CONFDIR)/init.pre}) unless -f q{$(B_CONFDIR)/init.pre}" -+ @ # $(PERL) -MFile::Copy -e "copy(q{rules/v310.pre}, q{$(B_CONFDIR)/v310.pre}) unless -f q{$(B_CONFDIR)/v310.pre}" -+ @ # $(PERL) -MFile::Copy -e "copy(q{rules/v312.pre}, q{$(B_CONFDIR)/v312.pre}) unless -f q{$(B_CONFDIR)/v312.pre}" -+ @ # $(PERL) -MFile::Copy -e "copy(q{rules/v320.pre}, q{$(B_CONFDIR)/v320.pre}) unless -f q{$(B_CONFDIR)/v320.pre}" -+ @ # $(PERL) -MFile::Copy -e "copy(q{rules/v330.pre}, q{$(B_CONFDIR)/v330.pre}) unless -f q{$(B_CONFDIR)/v330.pre}" -+ @ # $(PERL) -MFile::Copy -e "copy(q{rules/v340.pre}, q{$(B_CONFDIR)/v340.pre}) unless -f q{$(B_CONFDIR)/v340.pre}" +- $(PERL) -MFile::Copy -e "copy(q{rules/v341.pre}, q{$(B_CONFDIR)/v341.pre}) unless -f q{$(B_CONFDIR)/v341.pre}" ++ # manage local.cf and *.pre through pkgsrc .mk files ++ # $(PERL) -MFile::Copy -e "copy(q{rules/local.cf}, q{$(B_CONFDIR)/local.cf}) unless -f q{$(B_CONFDIR)/local.cf}" ++ # $(PERL) -MFile::Copy -e "copy(q{rules/init.pre}, q{$(B_CONFDIR)/init.pre}) unless -f q{$(B_CONFDIR)/init.pre}" ++ # $(PERL) -MFile::Copy -e "copy(q{rules/v310.pre}, q{$(B_CONFDIR)/v310.pre}) unless -f q{$(B_CONFDIR)/v310.pre}" ++ # $(PERL) -MFile::Copy -e "copy(q{rules/v312.pre}, q{$(B_CONFDIR)/v312.pre}) unless -f q{$(B_CONFDIR)/v312.pre}" ++ # $(PERL) -MFile::Copy -e "copy(q{rules/v320.pre}, q{$(B_CONFDIR)/v320.pre}) unless -f q{$(B_CONFDIR)/v320.pre}" ++ # $(PERL) -MFile::Copy -e "copy(q{rules/v330.pre}, q{$(B_CONFDIR)/v330.pre}) unless -f q{$(B_CONFDIR)/v330.pre}" ++ # $(PERL) -MFile::Copy -e "copy(q{rules/v340.pre}, q{$(B_CONFDIR)/v340.pre}) unless -f q{$(B_CONFDIR)/v340.pre}" ++ # $(PERL) -MFile::Copy -e "copy(q{rules/v341.pre}, q{$(B_CONFDIR)/v341.pre}) unless -f q{$(B_CONFDIR)/v341.pre}" + data__install: -$(MKPATH) $(B_DATADIR) $(PERL) -e "map unlink, <$(B_DATADIR)/*>" $(PREPROCESS) $(FIXVARS) -m$(PERM_RW) -Irules -O$(B_DATADIR) $(DATAFILES) - $(CHMOD) $(PERM_RWX) $(B_DATADIR) -+ @ # no change of directory created by pkgsrc -+ @ # $(CHMOD) $(PERM_RWX) $(B_DATADIR) ++ # no change of directory created by pkgsrc ++ # $(CHMOD) $(PERM_RWX) $(B_DATADIR) text_html_doc: made-doc-stamp $(NOOP) diff --git a/mail/spamassassin/patches/patch-README b/mail/spamassassin/patches/patch-README new file mode 100644 index 00000000000..d3902fcfa3c --- /dev/null +++ b/mail/spamassassin/patches/patch-README @@ -0,0 +1,91 @@ +$NetBSD: patch-README,v 1.1 2015/09/09 19:13:49 christos Exp $ + + Purely changes for pkgsrc: + + - Change paths to those used by pkgsrc + - Notes about search paths set by pkgsrc + +--- README.orig 2015-04-28 15:57:01.000000000 -0400 ++++ README 2015-09-09 14:57:29.000000000 -0400 +@@ -102,25 +102,25 @@ + the standard defaults that people use. There is an explanation of all the + default locations that Apache SpamAssassin will look at the end. + +- - /usr/share/spamassassin/*.cf: ++ - @@PREFIX@@/share/spamassassin/*.cf: + + Distributed configuration files, with all defaults. Do not modify + these, as they are overwritten when you upgrade. + +- - /var/lib/spamassassin/*/*.cf: ++ - @VARBASE@/spamassassin/*/*.cf: + + Local state directory; updated rulesets, overriding the + distributed configuration files, downloaded using "sa-update". Do + not modify these, as they are overwritten when you run + "sa-update". + +- - /etc/mail/spamassassin/*.cf: ++ - @PKG_SYSCONFDIR@/*.cf: + + Site config files, for system admins to create, modify, and + add local rules and scores to. Modifications here will be + appended to the config loaded from the above directory. + +- - /etc/mail/spamassassin/*.pre: ++ - @PKG_SYSCONFDIR@/*.pre: + + Plugin control files, installed from the distribution. These are + used to control what plugins are loaded. Modifications here will +@@ -129,22 +129,22 @@ + + You want to modify these files if you want to load additional + plugins, or inhibit loading a plugin that is enabled by default. +- If the files exist in /etc/mail/spamassassin, they will not ++ If the files exist in @PKG_SYSCONFDIR@, they will not + be overwritten during future installs. + +- - /usr/share/spamassassin/user_prefs.template: ++ - @@PREFIX@@/share/spamassassin/user_prefs.template: + + Distributed default user preferences. Do not modify this, as it is + overwritten when you upgrade. + +- - /etc/mail/spamassassin/user_prefs.template: ++ - @PKG_SYSCONFDIR@/user_prefs.template: + + Default user preferences, for system admins to create, modify, and + set defaults for users' preferences files. Takes precedence over + the above prefs file, if it exists. + + Do not put system-wide settings in here; put them in a file in the +- "/etc/mail/spamassassin" directory ending in ".cf". This file is ++ "@PKG_SYSCONFDIR@" directory ending in ".cf". This file is + just a template, which will be copied to a user's home directory + for them to change. + +@@ -198,6 +198,12 @@ + /opt/$DIR /opt/$DIR/share/spamassassin /etc/opt/mail/spamassassin + $DIR $DIR/share/spamassassin $DIR/etc/mail/spamassassin + ++(Pkgsrc note: the pkgsrc build process used the following path names ++ __prefix__: @@PREFIX@@ ++ __def_rules_dir__: @@PREFIX@@/share/spamassassin ++ __local_rules_dir__: @PKG_SYSCONFDIR@ ++) ++ + The files themselves are then looked for in these paths: + + - Distributed Configuration Files +@@ -237,6 +243,11 @@ + /opt/$DIR /var/opt/spamassassin/__version__ + $DIR $DIR/var/spamassassin/__version__ + ++(Pkgsrc note: the pkgsrc build process used the following path names ++ __prefix__: @@PREFIX@@ ++ __local_state_dir__: @VARBASE@/spamassassin/__version__ ++) ++ + This is normally written to by the "sa-update" script. "__version__" is + replaced by a representation of the version number, so that multiple + versions of Apache SpamAssassin will not interfere with each other's rulesets. diff --git a/mail/spamassassin/patches/patch-aq b/mail/spamassassin/patches/patch-aq deleted file mode 100644 index 0d38ac27865..00000000000 --- a/mail/spamassassin/patches/patch-aq +++ /dev/null @@ -1,91 +0,0 @@ -$NetBSD: patch-aq,v 1.7 2007/06/12 21:43:30 heinz Exp $ - - Purely changes for pkgsrc: - - - Change paths to those used by pkgsrc - - Notes about search paths set by pkgsrc - ---- README.orig 2007-06-08 14:56:25.000000000 +0200 -+++ README -@@ -99,25 +99,25 @@ Mail::SpamAssassin::Conf class (run the - the standard defaults that people use. There is an explanation of all the - default locations that SpamAssassin will look at the end. - -- - /usr/share/spamassassin/*.cf: -+ - @@PREFIX@@/share/spamassassin/*.cf: - - Distributed configuration files, with all defaults. Do not modify - these, as they are overwritten when you upgrade. - -- - /var/lib/spamassassin/*/*.cf: -+ - @VARBASE@/spamassassin/*/*.cf: - - Local state directory; updated rulesets, overriding the - distributed configuration files, downloaded using "sa-update". Do - not modify these, as they are overwritten when you run - "sa-update". - -- - /etc/mail/spamassassin/*.cf: -+ - @PKG_SYSCONFDIR@/*.cf: - - Site config files, for system admins to create, modify, and - add local rules and scores to. Modifications here will be - appended to the config loaded from the above directory. - -- - /etc/mail/spamassassin/*.pre: -+ - @PKG_SYSCONFDIR@/*.pre: - - Plugin control files, installed from the distribution. These are - used to control what plugins are loaded. Modifications here will -@@ -126,22 +126,22 @@ default locations that SpamAssassin will - - You want to modify these files if you want to load additional - plugins, or inhibit loading a plugin that is enabled by default. -- If the files exist in /etc/mail/spamassassin, they will not -+ If the files exist in @PKG_SYSCONFDIR@, they will not - be overwritten during future installs. - -- - /usr/share/spamassassin/user_prefs.template: -+ - @@PREFIX@@/share/spamassassin/user_prefs.template: - - Distributed default user preferences. Do not modify this, as it is - overwritten when you upgrade. - -- - /etc/mail/spamassassin/user_prefs.template: -+ - @PKG_SYSCONFDIR@/user_prefs.template: - - Default user preferences, for system admins to create, modify, and - set defaults for users' preferences files. Takes precedence over - the above prefs file, if it exists. - - Do not put system-wide settings in here; put them in a file in the -- "/etc/mail/spamassassin" directory ending in ".cf". This file is -+ "@PKG_SYSCONFDIR@" directory ending in ".cf". This file is - just a template, which will be copied to a user's home directory - for them to change. - -@@ -195,6 +195,12 @@ These are: - /opt/$DIR /opt/$DIR/share/spamassassin /etc/opt/mail/spamassassin - $DIR $DIR/share/spamassassin $DIR/etc/mail/spamassassin - -+(Pkgsrc note: the pkgsrc build process used the following path names -+ __prefix__: @@PREFIX@@ -+ __def_rules_dir__: @@PREFIX@@/share/spamassassin -+ __local_rules_dir__: @PKG_SYSCONFDIR@ -+) -+ - The files themselves are then looked for in these paths: - - - Distributed Configuration Files -@@ -234,6 +240,11 @@ ruleset: - /opt/$DIR /var/opt/spamassassin/__version__ - $DIR $DIR/var/spamassassin/__version__ - -+(Pkgsrc note: the pkgsrc build process used the following path names -+ __prefix__: @@PREFIX@@ -+ __local_state_dir__: @VARBASE@/spamassassin/__version__ -+) -+ - This is normally written to by the "sa-update" script. "__version__" is - replaced by a representation of the version number, so that multiple - versions of SpamAssassin will not interfere with each other's rulesets. diff --git a/mail/spamassassin/patches/patch-lib_Mail_SpamAssassin_DnsResolver.pm b/mail/spamassassin/patches/patch-lib_Mail_SpamAssassin_DnsResolver.pm deleted file mode 100644 index e08ebc14a00..00000000000 --- a/mail/spamassassin/patches/patch-lib_Mail_SpamAssassin_DnsResolver.pm +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-lib_Mail_SpamAssassin_DnsResolver.pm,v 1.3 2014/10/01 11:37:31 tron Exp $ - -Make this work with Net::DNS 0.76 or newer. - -Patch taken from SVN repository: - -https://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/DnsResolver.pm?r1=1603518&r2=1603517&pathrev=1603518 - ---- lib/Mail/SpamAssassin/DnsResolver.pm.orig 2014-02-07 08:36:28.000000000 +0000 -+++ lib/Mail/SpamAssassin/DnsResolver.pm 2014-10-01 09:35:33.000000000 +0100 -@@ -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; -- cgit v1.2.3