Commit e6a97411 authored by J0WI's avatar J0WI

main/spamassassin: security upgrade to 3.4.4

parent a8ead96c
Pipeline #19610 failed with stages
in 12 minutes and 11 seconds
......@@ -2,8 +2,8 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=spamassassin
_pkgreal=Mail-SpamAssassin
pkgver=3.4.3
pkgrel=1
pkgver=3.4.4
pkgrel=0
pkgdesc="The Powerful #1 Open-Source Spam Filter"
url="https://metacpan.org/pod/Mail::SpamAssassin"
arch="all"
......@@ -19,10 +19,14 @@ source="https://cpan.metacpan.org/authors/id/K/KM/KMCGRAIL/${_pkgreal#*-}/$_pkgr
spamd.confd
spamd.crond
Mail-SpamAssassin.patch
fix-test.patch
"
builddir="$srcdir/$_pkgreal-$pkgver"
# secfixes:
# 3.4.4-r0:
# - CVE-2020-1930
# - CVE-2020-1931
# 3.4.3-r0:
# - CVE-2018-11805
# - CVE-2019-12420
......@@ -48,7 +52,7 @@ check() {
package() {
cd "$builddir"
make DESTDIR="$pkgdir" install || return 1
make DESTDIR="$pkgdir" install
find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
install -Dm755 "$srcdir"/spamd.crond "$pkgdir"/etc/periodic/daily/$pkgname-update
install -Dm755 "$srcdir"/spamd.initd "$pkgdir"/etc/init.d/spamd
......@@ -83,8 +87,9 @@ cpan() {
sed -i '/^#\*/d' "$subpkgdir"/etc/mail/$pkgname/user_prefs
}
sha512sums="d2fd657d3c20273b0c06cb1da083d757d3f2a7f60c7ed6e6ad8f98e6df33c9c5f3824f0531abf5dbc32b0dde22979d7d671231fa2ef0d8b073ea6804c5de0c3a Mail-SpamAssassin-3.4.3.tar.gz
sha512sums="b6efa1c733ddf810b189ec69445faeae6488ee2671f87f56b49ec3bf85690bf7950aa5ce251c1f1371b2bbe4fb88dbce0a162c9a24a48ed5e6584f9019611552 Mail-SpamAssassin-3.4.4.tar.gz
0a22933290a3abd147689bf3a9de4b6b277628c22966f353c5da932cd98560babf1d0bb9d92c456ea24decfb5af0bbc960192d29a90d9cab437e7986c75c8278 spamd.initd
274d3aa0d9aab05e83c8d5ad3e93a457649360021a67c8cb19088365bed681ebe26889cfa86f8c46a6044c7ee969231f2a71e3227adf8ad9e38d0286b9caf48d spamd.confd
e0bbdb21020f4b4e5b11fb3ec18ad7e496fa4521d24275d806db96fc91cde3c0b8e8c8215e51b18903bf5916de74e9e2584fe7f62a9ec7da2f185641e533916d spamd.crond
66a6daa7e9898864497e7d8e17efc6094aabc5a9a94afbc7da08acf4cf2430fad2cb0128b8db4be637f5dcabe3fa9f03490f9d7cbba3c1cc02b7824f63cd0965 Mail-SpamAssassin.patch"
66a6daa7e9898864497e7d8e17efc6094aabc5a9a94afbc7da08acf4cf2430fad2cb0128b8db4be637f5dcabe3fa9f03490f9d7cbba3c1cc02b7824f63cd0965 Mail-SpamAssassin.patch
6eda2d1073bcf999a976de3e4e2c928a044d46962ce1a4f169078bfc017fb7d0f39d2fc78b17734c2d936649b34638abed3cf9ebeb51614531134289eb23afa6 fix-test.patch"
From 0ae43e7fe4b1e23bc170e16a64c73a8b517c013a Mon Sep 17 00:00:00 2001
From: Henrik Krohns <hege@apache.org>
Date: Mon, 27 Jan 2020 12:21:46 +0000
Subject: [PATCH] Fix strip2.t
git-svn-id: https://svn.apache.org/repos/asf/spamassassin/trunk@1873205 13f79535-47bb-0310-9956-ffa450edef68
---
t/strip2.t | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/t/strip2.t b/t/strip2.t
index fb268e2107..4ababeda30 100755
--- a/t/strip2.t
+++ b/t/strip2.t
@@ -4,7 +4,7 @@ use lib '.'; use lib 't';
use SATest; sa_t_init("strip2");
use Test::More;
-plan skip_all => 'Long running tests disabled' if conf_bool('run_long_tests');
+plan skip_all => 'Long running tests disabled' unless conf_bool('run_long_tests');
plan tests => 98;
# ---------------------------------------------------------------------------
@@ -48,7 +48,7 @@ foreach $input (@files) {
$test_number = test_number();
my $d_output = "log/d.$testname/$test_number";
unlink $d_output;
- ok sarun ("-d < $d_input");
+ ok sarun ("-L -d < $d_input");
ok (-f $d_output);
ok(!compare_text($input,$d_output))
or diffwarn( $input, $d_output );
@@ -72,7 +72,7 @@ foreach $input (@files) {
$test_number = test_number();
my $d_output = "log/d.$testname/$test_number";
unlink $d_output;
- ok sarun ("-d < $d_input");
+ ok sarun ("-L -d < $d_input");
ok (-f $d_output);
ok(!compare_text($input,$d_output))
or diffwarn( $input, $d_output );
@@ -101,7 +101,7 @@ ok (-f $d_input);
$test_number = test_number();
my $d_output = "log/d.$testname/$test_number";
unlink $d_output;
- ok sarun ("-d < $d_input");
+ ok sarun ("-L -d < $d_input");
ok (-f $d_output);
ok(!compare_text($input,$d_output))
or diffwarn( $input, $d_output );
@@ -111,7 +111,7 @@ ok (-f $d_input);
$test_number = test_number();
my $d_output = "log/d.$testname/$test_number";
unlink $d_output;
-ok sarun ("-d < $input");
+ok sarun ("-L -d < $input");
ok (-f $d_output);
ok(!compare_text($input,$d_output))
or diffwarn( $input, $d_output );
@@ -119,8 +119,8 @@ ok(!compare_text($input,$d_output))
sub diffwarn {
my ($f1, $f2) = @_;
- print "# Diff is as follows:\n";
- untaint_system "diff -u $f1 $f2";
+ print STDERR "# Diff is as follows:\n";
+ untaint_system "diff -u $f1 $f2 | cat -v >&2";
print "\n\n";
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment