aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDuncan Bellamy <dunk@denkimushi.com>2021-09-25 15:40:11 +0000
committerMilan P. Stanić <mps@arvanta.net>2021-09-25 21:31:25 +0000
commit0c8cbbf48903eb7700845d71b88982d0d26422f5 (patch)
treebd0b66b45a28671514389c304acc0b997922b1b4
parent554cb4bda8a842b1645e2b69671bd9996c5d8940 (diff)
downloadaports-0c8cbbf48903eb7700845d71b88982d0d26422f5.tar.gz
aports-0c8cbbf48903eb7700845d71b88982d0d26422f5.tar.bz2
aports-0c8cbbf48903eb7700845d71b88982d0d26422f5.tar.xz
main/spamassassin: enable on x86
* remove -T flag on failing tests * trim /usr/local/bin off env path or perl taint test fails
-rw-r--r--main/spamassassin/APKBUILD14
-rw-r--r--main/spamassassin/taint.patch27
2 files changed, 36 insertions, 5 deletions
diff --git a/main/spamassassin/APKBUILD b/main/spamassassin/APKBUILD
index 52204f5453..81c8499277 100644
--- a/main/spamassassin/APKBUILD
+++ b/main/spamassassin/APKBUILD
@@ -3,10 +3,10 @@
pkgname=spamassassin
_pkgreal=Mail-SpamAssassin
pkgver=3.4.6
-pkgrel=2
+pkgrel=3
pkgdesc="The Powerful #1 Open-Source Spam Filter"
url="https://metacpan.org/pod/Mail::SpamAssassin"
-arch="all !x86" # testsuite fails on x86
+arch="all"
license="Apache-2.0"
_perl_depends="perl-html-parser perl-digest-sha1 perl-netaddr-ip perl-net-dns perl-mail-dkim
perl-mime-base64 perl-time-hires perl-libwww perl gpg"
@@ -25,6 +25,7 @@ source="https://cpan.metacpan.org/authors/id/S/SI/SIDNEY/Mail-SpamAssassin-$pkgv
spamd.crond
Mail-SpamAssassin.patch
fix-test.patch
+ taint.patch
"
builddir="$srcdir/$_pkgreal-$pkgver"
@@ -45,7 +46,7 @@ builddir="$srcdir/$_pkgreal-$pkgver"
build() {
rm t/dnsbl_subtests.t
- export CFLAGS="$(perl -MConfig -E 'say $Config{ccflags}')"
+ export CFLAGS="$CFLAGS $(perl -MConfig -E 'say $Config{ccflags}')"
PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
make
}
@@ -89,9 +90,12 @@ cpan() {
sed -i '/^#\*/d' "$subpkgdir"/etc/mail/$pkgname/user_prefs
}
-sha512sums="7910852f04463a7363a2fc3b70a35adadf5714552e57c5b8ca57beaa534ee18d9f06526cdbcf8bcd5781e5ca778f98d2f84ef2efd1872fa550cfe1689440364a Mail-SpamAssassin-3.4.6.tar.gz
+sha512sums="
+7910852f04463a7363a2fc3b70a35adadf5714552e57c5b8ca57beaa534ee18d9f06526cdbcf8bcd5781e5ca778f98d2f84ef2efd1872fa550cfe1689440364a Mail-SpamAssassin-3.4.6.tar.gz
0a22933290a3abd147689bf3a9de4b6b277628c22966f353c5da932cd98560babf1d0bb9d92c456ea24decfb5af0bbc960192d29a90d9cab437e7986c75c8278 spamd.initd
274d3aa0d9aab05e83c8d5ad3e93a457649360021a67c8cb19088365bed681ebe26889cfa86f8c46a6044c7ee969231f2a71e3227adf8ad9e38d0286b9caf48d spamd.confd
a08854bb12fbd4a5f32e2b3176de8d70c4b64aa58ed8debb6de21a4dabc5c5a750dd89a48dd518e5a3579b3e90b09085b736cae0b1cf3790a02226aa32d44b5c spamd.crond
66a6daa7e9898864497e7d8e17efc6094aabc5a9a94afbc7da08acf4cf2430fad2cb0128b8db4be637f5dcabe3fa9f03490f9d7cbba3c1cc02b7824f63cd0965 Mail-SpamAssassin.patch
-6eda2d1073bcf999a976de3e4e2c928a044d46962ce1a4f169078bfc017fb7d0f39d2fc78b17734c2d936649b34638abed3cf9ebeb51614531134289eb23afa6 fix-test.patch"
+6eda2d1073bcf999a976de3e4e2c928a044d46962ce1a4f169078bfc017fb7d0f39d2fc78b17734c2d936649b34638abed3cf9ebeb51614531134289eb23afa6 fix-test.patch
+a2d0625b2224641abd338879044f7dcb4c47d09cbc6318c978b88e70e40d0129a7d68e97458ea2d23afcc465f99805a6359153d09e9fc9da881de31ad7a27c4a taint.patch
+"
diff --git a/main/spamassassin/taint.patch b/main/spamassassin/taint.patch
new file mode 100644
index 0000000000..c5a2c1cc5a
--- /dev/null
+++ b/main/spamassassin/taint.patch
@@ -0,0 +1,27 @@
+--- a/t/SATest.pm
++++ b/t/SATest.pm
+@@ -58,7 +58,7 @@
+ };
+
+ # Clean PATH so taint doesn't complain
+- $ENV{'PATH'} = '/bin:/usr/bin:/usr/local/bin';
++ $ENV{'PATH'} = '/bin:/usr/bin';
+ # Remove tainted envs, at least ENV used in FreeBSD
+ delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
+ }
+--- a/t/config_tree_recurse.t
++++ b/t/config_tree_recurse.t
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -T
++#!/usr/bin/perl
+ #
+ # Test that config_tree_recurse works ok in taint mode; bug 6019
+
+--- a/t/spamd_utf8.t
++++ b/t/spamd_utf8.t
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -T
++#!/usr/bin/perl
+
+ use lib '.'; use lib 't';
+ use SATest; sa_t_init("spamd_utf8");