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

[Florian Pritz]

    Date: Thursday, June 5, 2014 @ 20:50:35
  Author: bluewind
Revision: 214307

upgpkg: spamassassin 3.4.0-2

fix FS#40707; Net::DNS dev version causes errors

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

---------------+
 PKGBUILD      |    9 ++++++---
 net-dns.patch |   27 +++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-06-05 17:24:35 UTC (rev 214306)
+++ PKGBUILD	2014-06-05 18:50:35 UTC (rev 214307)
@@ -4,7 +4,7 @@
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A mail filter to identify spam."
 arch=('i686' 'x86_64')
 license=('APACHE')
@@ -22,10 +22,11 @@
         'etc/mail/spamassassin/v330.pre')
 install="${pkgname}.install"
 source=("http://www.us.apache.org/dist/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz"{,.asc}
-        'spamassassin.service')
+        'spamassassin.service' net-dns.patch)
 md5sums=('5d0b50cee3bfa905cca35c33296c8c2a'
          'SKIP'
-         'd0ce5f8a02fd74dbc83632f4aaec6185')
+         'd0ce5f8a02fd74dbc83632f4aaec6185'
+         'bd27e3a54784a0a519d3abff3fa82392')
 
 prepare() {
   cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
@@ -33,6 +34,8 @@
   sed -i t/sa_compile.t \
 	  -e 's#/foo/bin/spamassassin#/foo/bin/site_perl/spamassassin#' \
 	  -e 's#/foo/bin/sa-compile#/foo/bin/site_perl/sa-compile#'
+
+  patch -p1 -i "$srcdir/net-dns.patch"
 }
 
 build() {

Added: net-dns.patch
===================================================================
--- net-dns.patch	                        (rev 0)
+++ net-dns.patch	2014-06-05 18:50:35 UTC (rev 214307)
@@ -0,0 +1,27 @@
+Fix FS#40707 by disabling the failing version check. We don't ship versions that old anyway.
+
+---
+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
++++ b/lib/Mail/SpamAssassin/Dns.pm	2014-06-05 19:35:56.816256160 +0200
+@@ -518,7 +518,7 @@
+       }
+     }
+     else {
+-      if ($Net::DNS::VERSION < 0.34) {
++      if (0) {
+ 	warn("dns: Net::DNS version is $Net::DNS::VERSION, but need 0.34");
+ 	return $IS_DNS_AVAILABLE;
+       }
+diff -Nur a/lib/Mail/SpamAssassin/Plugin/AskDNS.pm Mail-SpamAssassin-3.4.0/lib/Mail/SpamAssassin/Plugin/AskDNS.pm
+--- a/lib/Mail/SpamAssassin/Plugin/AskDNS.pm	2014-06-05 19:34:56.302725263 +0200
++++ b/lib/Mail/SpamAssassin/Plugin/AskDNS.pm	2014-06-05 19:35:30.086168916 +0200
+@@ -211,7 +211,7 @@
+ 
+   $self->set_config($sa_main->{conf});
+ 
+-  $txtdata_can_provide_a_list = Net::DNS->VERSION >= 0.69;
++  $txtdata_can_provide_a_list = 1;
+ 
+   return $self;
+ }