From d0d8dcbf761b090b3a72ac2d69e05d6a2cca4e2b Mon Sep 17 00:00:00 2001
From: Leonardo Arena <rnalrd@alpinelinux.org>
Date: Thu, 25 Dec 2014 09:50:15 +0000
Subject: main/spamassassin: DNSBL tests fail after changes in perl

---
 main/spamassassin/APKBUILD                         | 29 +++++++++++++++-------
 .../spamassassin-3.4.0-dns-resolver.patch          | 16 ++++++++++++
 2 files changed, 36 insertions(+), 9 deletions(-)
 create mode 100644 main/spamassassin/spamassassin-3.4.0-dns-resolver.patch

(limited to 'main/spamassassin')

diff --git a/main/spamassassin/APKBUILD b/main/spamassassin/APKBUILD
index 39ff6b9e7a..a16cf6ed13 100644
--- a/main/spamassassin/APKBUILD
+++ b/main/spamassassin/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=spamassassin
 _realname=Mail-SpamAssassin
 pkgver=3.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The Powerful #1 Open-Source Spam Filter"
 url="http://spamassassin.apache.org"
 arch="all"
@@ -13,21 +13,29 @@ depends="gnupg perl perl-digest-sha1 perl-io-compress perl-time-hires
 makedepends="perl-dev zlib-dev"
 install=
 subpackages="$pkgname-doc"
-source="http://www.apache.org/dist/spamassassin/source/$_realname-$pkgver.tar.gz"
+source="http://www.apache.org/dist/spamassassin/source/$_realname-$pkgver.tar.gz
+	spamassassin-3.4.0-dns-resolver.patch
+	"
+
+_builddir="$srcdir/$_realname-$pkgver"
 
 prepare() {
-	cd "$srcdir/$_realname-$pkgver"
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg "Applying $i"; patch -p1 -i "$srcdir"/$i || return 1
+		esac
+	done
 }
 
 build() {
-	cd "$srcdir/$_realname-$pkgver"
-
+	cd "$_builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
 	make
 }
 
 package() {
-	cd "$srcdir/$_realname-$pkgver"
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 	install -m755 -D ../../spamd.init $pkgdir/etc/init.d/spamd
 	install -m644 -D ../../spamd.conf $pkgdir/etc/conf.d/spamd
@@ -37,6 +45,9 @@ package() {
 	find "$pkgdir" -name perllocal.pod -delete
 }
 
-md5sums="5d0b50cee3bfa905cca35c33296c8c2a  Mail-SpamAssassin-3.4.0.tar.gz"
-sha256sums="244914c30976844878a7f129fd503eb40986c68a3800f416c3a68b14507c0a64  Mail-SpamAssassin-3.4.0.tar.gz"
-sha512sums="c5f85c9e661018c6306550f10ae609a0e71ba476e9ee88616dc6b880fc6c09ed774dded27c70ff7e67cc2e9f684c5e2a6a19f5d7db1a8168441b9cb2975fc41e  Mail-SpamAssassin-3.4.0.tar.gz"
+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"
diff --git a/main/spamassassin/spamassassin-3.4.0-dns-resolver.patch b/main/spamassassin/spamassassin-3.4.0-dns-resolver.patch
new file mode 100644
index 0000000000..b593a1d96b
--- /dev/null
+++ b/main/spamassassin/spamassassin-3.4.0-dns-resolver.patch
@@ -0,0 +1,16 @@
+--- 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
-- 
cgit v1.2.3