diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-06-09 03:26:57 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-06-09 03:26:57 +0000 |
| commit | b42468f5bd3d7f19c1a0fa0ee08289745958caae (patch) | |
| tree | b5fe4dd361f9cc19b67dd190bd47e963818eac1b /extra/spamassassin | |
| parent | e3d67b3b2c7235fa6db9787b951bbdfcf568d8bc (diff) | |
Mon Jun 9 03:23:59 UTC 2014
Diffstat (limited to 'extra/spamassassin')
| -rw-r--r-- | extra/spamassassin/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/spamassassin/net-dns.patch | 16 |
2 files changed, 18 insertions, 4 deletions
diff --git a/extra/spamassassin/PKGBUILD b/extra/spamassassin/PKGBUILD index e15741009..2acbaf8dd 100644 --- a/extra/spamassassin/PKGBUILD +++ b/extra/spamassassin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 214308 2014-06-05 18:50:41Z bluewind $ +# $Id: PKGBUILD 214376 2014-06-08 07:55:08Z fyan $ # Maintainer: Florian Pritz <bluewind@xinu.at> # Contributor: Dale Blount <dale@archlinux.org> # 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 @@ source=("http://www.us.apache.org/dist/${pkgname}/source/Mail-SpamAssassin-${pkg md5sums=('5d0b50cee3bfa905cca35c33296c8c2a' 'SKIP' 'd0ce5f8a02fd74dbc83632f4aaec6185' - 'bd27e3a54784a0a519d3abff3fa82392') + '0bcf0419608ec4ac200e794563620f31') prepare() { cd "${srcdir}/Mail-SpamAssassin-${pkgver}" diff --git a/extra/spamassassin/net-dns.patch b/extra/spamassassin/net-dns.patch index 84db0c598..76d28167d 100644 --- a/extra/spamassassin/net-dns.patch +++ b/extra/spamassassin/net-dns.patch @@ -1,4 +1,7 @@ -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 @@ -25,3 +28,14 @@ diff -Nur a/lib/Mail/SpamAssassin/Plugin/AskDNS.pm Mail-SpamAssassin-3.4.0/lib/M 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(', ',@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(', ',@ns_addr_port)); + } + return @ns_addr_port; |