[arch-commits] Commit in spamassassin/trunk (PKGBUILD net-dns.patch)

[Felix Yan]

    Date: Sunday, June 8, 2014 @ 09:53:16
  Author: fyan
Revision: 214375

upgpkg: spamassassin 3.4.0-3

- fix nameserver fetching from net-dns

Modified:
  spamassassin/trunk/PKGBUILD
  spamassassin/trunk/net-dns.patch

---------------+
 PKGBUILD      |    4 ++--
 net-dns.patch |   16 +++++++++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-06-08 04:02:14 UTC (rev 214374)
+++ PKGBUILD	2014-06-08 07:53:16 UTC (rev 214375)
@@ -4,7 +4,7 @@
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.4.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A mail filter to identify spam."
 arch=('i686' 'x86_64')
 license=('APACHE')
@@ -26,7 +26,7 @@
 md5sums=('5d0b50cee3bfa905cca35c33296c8c2a'
          'SKIP'
          'd0ce5f8a02fd74dbc83632f4aaec6185'
-         'bd27e3a54784a0a519d3abff3fa82392')
+         '0bcf0419608ec4ac200e794563620f31')
 
 prepare() {
   cd "${srcdir}/Mail-SpamAssassin-${pkgver}"

Modified: net-dns.patch
===================================================================
--- net-dns.patch	2014-06-08 04:02:14 UTC (rev 214374)
+++ net-dns.patch	2014-06-08 07:53:16 UTC (rev 214375)
@@ -1,5 +1,8 @@
-Fix FS#40707 by disabling the failing version check. We don't ship versions that old anyway.
+Fix FS#40707 by
 
+- disabling the failing version check. We don't ship versions that old anyway.
+- fix nameservers fetching from Net::DNS
+
 ---
 diff -Nur a/lib/Mail/SpamAssassin/Dns.pm b/lib/Mail/SpamAssassin/Dns.pm
 --- a/lib/Mail/SpamAssassin/Dns.pm	2014-06-05 19:34:56.299391918 +0200
@@ -25,3 +28,14 @@
  
    return $self;
  }
+--- a/lib/Mail/SpamAssassin/DnsResolver.pm	2014-06-08 12:48:29.064230952 +0800
++++ b/lib/Mail/SpamAssassin/DnsResolver.pm	2014-06-08 12:49:06.961872678 +0800
+@@ -205,7 +205,7 @@
+     dbg("dns: servers set by config to: %s", join(', ', at 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}});
++                        $res->nameservers);
+     dbg("dns: servers obtained from Net::DNS : %s", join(', ', at ns_addr_port));
+   }
+   return @ns_addr_port;