diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-06-06 04:00:43 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-06-06 04:00:43 +0000 |
| commit | 6b55be9272c15e1858a1a7236482298f677c1a3b (patch) | |
| tree | a00e7300c358b2a4b16184192c53b8ce555a2412 /extra/spamassassin | |
| parent | 8faa42b28f39ace5fc2c3ec8a054fa0a5b246eab (diff) | |
Fri Jun 6 03:57:24 UTC 2014
Diffstat (limited to 'extra/spamassassin')
| -rw-r--r-- | extra/spamassassin/PKGBUILD | 11 | ||||
| -rw-r--r-- | extra/spamassassin/net-dns.patch | 27 |
2 files changed, 34 insertions, 4 deletions
diff --git a/extra/spamassassin/PKGBUILD b/extra/spamassassin/PKGBUILD index 1b527bd5c..e15741009 100644 --- a/extra/spamassassin/PKGBUILD +++ b/extra/spamassassin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 205860 2014-02-11 21:25:20Z bluewind $ +# $Id: PKGBUILD 214308 2014-06-05 18:50:41Z bluewind $ # Maintainer: Florian Pritz <bluewind@xinu.at> # Contributor: Dale Blount <dale@archlinux.org> # 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 @@ backup=('etc/mail/spamassassin/local.cf' '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 @@ prepare() { 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() { diff --git a/extra/spamassassin/net-dns.patch b/extra/spamassassin/net-dns.patch new file mode 100644 index 000000000..84db0c598 --- /dev/null +++ b/extra/spamassassin/net-dns.patch @@ -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; + } |