diff options
| -rw-r--r-- | main/spamassassin/APKBUILD | 14 | ||||
| -rw-r--r-- | main/spamassassin/spamassassin-3.4.0-dns-resolver.patch | 16 |
2 files changed, 5 insertions, 25 deletions
diff --git a/main/spamassassin/APKBUILD b/main/spamassassin/APKBUILD index a16cf6ed13..d579892d2c 100644 --- a/main/spamassassin/APKBUILD +++ b/main/spamassassin/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=spamassassin _realname=Mail-SpamAssassin -pkgver=3.4.0 -pkgrel=2 +pkgver=3.4.1 +pkgrel=0 pkgdesc="The Powerful #1 Open-Source Spam Filter" url="http://spamassassin.apache.org" arch="all" @@ -14,7 +14,6 @@ makedepends="perl-dev zlib-dev" install= subpackages="$pkgname-doc" source="http://www.apache.org/dist/spamassassin/source/$_realname-$pkgver.tar.gz - spamassassin-3.4.0-dns-resolver.patch " _builddir="$srcdir/$_realname-$pkgver" @@ -45,9 +44,6 @@ package() { find "$pkgdir" -name perllocal.pod -delete } -md5sums="5d0b50cee3bfa905cca35c33296c8c2a Mail-SpamAssassin-3.4.0.tar.gz -438e86d3cf27552e6145c0a4ab88a8f9 spamassassin-3.4.0-dns-resolver.patch" -sha256sums="244914c30976844878a7f129fd503eb40986c68a3800f416c3a68b14507c0a64 Mail-SpamAssassin-3.4.0.tar.gz -924777fd5522af5b435080b2709658bf87a1ae3ad851b3fd833c46e96354a919 spamassassin-3.4.0-dns-resolver.patch" -sha512sums="c5f85c9e661018c6306550f10ae609a0e71ba476e9ee88616dc6b880fc6c09ed774dded27c70ff7e67cc2e9f684c5e2a6a19f5d7db1a8168441b9cb2975fc41e Mail-SpamAssassin-3.4.0.tar.gz -fb5ddcf48e7104663883b113d0b9d7cd5a9d89844c4318d2ddacd99709b08402c8bf5d14d2aa502aa1ca7eae4dd5ce6d5312fada8a2bfad4cf73bb77ff735ea2 spamassassin-3.4.0-dns-resolver.patch" +md5sums="76eca1f38c11635d319e62c26d5b034b Mail-SpamAssassin-3.4.1.tar.gz" +sha256sums="9b7a95a594cdca4f265707364478b57813b82a0ec7e520d9bc818bfbcafdd726 Mail-SpamAssassin-3.4.1.tar.gz" +sha512sums="6a074f1a4177e1969cef575fe3b1b844d27c813d48fe1e07a46f56ffa728fc780897597d00f11acb269317a6308f284f0dee544d504da874d93b0549d094a6a3 Mail-SpamAssassin-3.4.1.tar.gz" diff --git a/main/spamassassin/spamassassin-3.4.0-dns-resolver.patch b/main/spamassassin/spamassassin-3.4.0-dns-resolver.patch deleted file mode 100644 index b593a1d96b..0000000000 --- a/main/spamassassin/spamassassin-3.4.0-dns-resolver.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/lib/Mail/SpamAssassin/DnsResolver.pm -+++ b/lib/Mail/SpamAssassin/DnsResolver.pm -@@ -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; -Only in b: lib/Mail/patch.patch |