main/spamassassin: security upgrade 3.4.2

CVE-2016-1238, CVE-2017-15705, CVE-2018-11780, CVE-2018-11781

main/spamassassin/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=spamassassin
 _pkgreal=Mail-SpamAssassin
-pkgver=3.4.1
-pkgrel=8
+pkgver=3.4.2
+pkgrel=0
 pkgdesc="The Powerful #1 Open-Source Spam Filter"
 url="http://search.cpan.org/dist/Mail-SpamAssassin/"
 arch="all"
@@ -18,12 +18,17 @@ source="http://search.cpan.org/CPAN/authors/id/K/KM/KMCGRAIL/${_pkgreal#*-}/$_pk
 	spamd.initd
 	spamd.confd
 	spamd.crond
-	net-dns-1.01-compat.patch
 	Mail-SpamAssassin.patch
-	bad-regexp-and-logic.patch
 	"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
+# secfixes:
+#   3.4.2-r0:
+#     - CVE-2016-1238
+#     - CVE-2017-15705
+#     - CVE-2018-11780
+#     - CVE-2018-11781
+
 build() {
 	cd "$builddir"
 	rm t/dnsbl_subtests.t
@@ -74,10 +79,8 @@ cpan() {
 	sed -i '/^#\*/d' "$subpkgdir"/etc/mail/$pkgname/user_prefs
 }
 
-sha512sums="6a074f1a4177e1969cef575fe3b1b844d27c813d48fe1e07a46f56ffa728fc780897597d00f11acb269317a6308f284f0dee544d504da874d93b0549d094a6a3  Mail-SpamAssassin-3.4.1.tar.gz
+sha512sums="85e3d78bb885ad1d0bf2066d1bc919d6ad5e9f86795069397e7c28cc1ba02870566ec014c08c81f68e7ed03b7f60d2de0b9730b3415b35d848abde2c8920a28f  Mail-SpamAssassin-3.4.2.tar.gz
 0a22933290a3abd147689bf3a9de4b6b277628c22966f353c5da932cd98560babf1d0bb9d92c456ea24decfb5af0bbc960192d29a90d9cab437e7986c75c8278  spamd.initd
 274d3aa0d9aab05e83c8d5ad3e93a457649360021a67c8cb19088365bed681ebe26889cfa86f8c46a6044c7ee969231f2a71e3227adf8ad9e38d0286b9caf48d  spamd.confd
 c8c00e4281cefd5e5e15507c8890264a25aa59663c57ccdf7a77905e2550999cfbbfa7271189a9491b0a0e98dff432361f13becdb99e1b583cd9d45d68022a47  spamd.crond
-7651b0b6a13322ecc338cd43ef67246c02c846162d419e3d1586e2d53161fc055d1ba80800f5210658cc360ac3ccd3c2176f1463780b0486ec65c0bac3b338fd  net-dns-1.01-compat.patch
-66a6daa7e9898864497e7d8e17efc6094aabc5a9a94afbc7da08acf4cf2430fad2cb0128b8db4be637f5dcabe3fa9f03490f9d7cbba3c1cc02b7824f63cd0965  Mail-SpamAssassin.patch
-fef24813fd643bcc3d945b1d53145c9290e8567ea4ed9c39a31cc0b0381a3949ef82840383f0c7dd4ac641f9dace6c08e39cf39e32b9906dc865f2fce1770c06  bad-regexp-and-logic.patch"
+66a6daa7e9898864497e7d8e17efc6094aabc5a9a94afbc7da08acf4cf2430fad2cb0128b8db4be637f5dcabe3fa9f03490f9d7cbba3c1cc02b7824f63cd0965  Mail-SpamAssassin.patch"

main/spamassassin/bad-regexp-and-logic.patch

@@ -1,36 +0,0 @@
-From edb00a8d76a625bf03227ee2f6e915c9a0d90bad Mon Sep 17 00:00:00 2001
-From: Mark Martinec <mmartinec@apache.org>
-Date: Tue, 11 Apr 2017 18:37:20 +0000
-Subject: [PATCH] Bug 7404: Bad regexp (and logic) in
- MS::PerMsgStatus::get_content_preview
-
-git-svn-id: https://svn.apache.org/repos/asf/spamassassin/trunk@1791010 13f79535-47bb-0310-9956-ffa450edef68
----
- lib/Mail/SpamAssassin/PerMsgStatus.pm | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/lib/Mail/SpamAssassin/PerMsgStatus.pm b/lib/Mail/SpamAssassin/PerMsgStatus.pm
-index f8c55061b..126157bf5 100644
---- a/lib/Mail/SpamAssassin/PerMsgStatus.pm
-+++ b/lib/Mail/SpamAssassin/PerMsgStatus.pm
-@@ -896,16 +896,16 @@ sub get_content_preview {
-     $str .= shift @{$ary};
-   }
-   undef $ary;
--  chomp ($str); $str .= " [...]\n";
- 
-   # in case the last line was huge, trim it back to around 200 chars
-   local $1;
--  $str =~ s/^(.{,200}).*$/$1/gs;
-+  $str =~ s/^(.{200}).+$/$1 [...]/gm;
-+  chomp ($str); $str .= "\n";
- 
-   # now, some tidy-ups that make things look a bit prettier
--  $str =~ s/-----Original Message-----.*$//gs;
-+  $str =~ s/-----Original Message-----.*$//gm;
-   $str =~ s/This is a multi-part message in MIME format\.//gs;
--  $str =~ s/[-_\*\.]{10,}//gs;
-+  $str =~ s/[-_*.]{10,}//gs;
-   $str =~ s/\s+/ /gs;
- 
-   # add "Content preview:" ourselves, so that the text aligns

main/spamassassin/net-dns-1.01-compat.patch

@@ -1,18 +0,0 @@
-Fix Bug 7223: Net::DNS 1.01 breaks DnsResolver
-
-This bug is already fixed for version 3.4.2 and later.
-
-See: https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7223
-
---- a/lib/Mail/SpamAssassin/DnsResolver.pm
-+++ b/lib/Mail/SpamAssassin/DnsResolver.pm
-@@ -592,6 +592,9 @@
-   };
- 
-   if ($packet) {
-+    # RD flag needs to be set explicitly since Net::DNS 1.01, Bug 7223	
-+    $packet->header->rd(1);
-+
-   # my $udp_payload_size = $self->{res}->udppacketsize;
-     my $udp_payload_size = $self->{conf}->{dns_options}->{edns};
-     if ($udp_payload_size && $udp_payload_size > 512) {