commit: ef3433e77824185dca2aff5a495d8611d28a3179 Author: Philippe Chaintreuil <gentoo_bugs_peep <AT> parallaxshift <DOT> com> AuthorDate: Sun Jun 2 23:18:49 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jun 3 01:31:01 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef3433e7
mail-filter/spamassassin: Fix sa_txrep test when no dbm Upstream's fix is way more involved. I'll leave that for 4.0.2, I guess. https://github.com/apache/spamassassin/commit/1c6fe5993ce48099aa73eb1d87419f50f922a0a6 Closes: https://bugs.gentoo.org/933406 Closes: https://github.com/gentoo/gentoo/pull/36986 Signed-off-by: Philippe Chaintreuil <gentoo_bugs_peep <AT> parallaxshift.com> Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/4.0.1-tests-sa_txrep.t-no-dbm.patch | 16 ++++++++++++++++ mail-filter/spamassassin/spamassassin-4.0.1.ebuild | 1 + 2 files changed, 17 insertions(+) diff --git a/mail-filter/spamassassin/files/4.0.1-tests-sa_txrep.t-no-dbm.patch b/mail-filter/spamassassin/files/4.0.1-tests-sa_txrep.t-no-dbm.patch new file mode 100644 index 000000000000..6d6b4dd9a024 --- /dev/null +++ b/mail-filter/spamassassin/files/4.0.1-tests-sa_txrep.t-no-dbm.patch @@ -0,0 +1,16 @@ +https://bugs.gentoo.org/933406 +--- a/t/sa_txrep.t ++++ b/t/sa_txrep.t +@@ -4,7 +4,11 @@ use lib '.'; use lib 't'; + use SATest; sa_t_init("sa_txrep"); + + +-use Test::More tests => 8; ++use Test::More; ++ ++my @dbmods = grep eval "require $_", ('DB_File', 'GDBM_File', 'SDBM_File'); ++plan skip_all => "No db module is available" unless @dbmods; ++plan tests => 8; + + # --------------------------------------------------------------------------- + diff --git a/mail-filter/spamassassin/spamassassin-4.0.1.ebuild b/mail-filter/spamassassin/spamassassin-4.0.1.ebuild index d778722d02cc..4e04f9b1ff8d 100644 --- a/mail-filter/spamassassin/spamassassin-4.0.1.ebuild +++ b/mail-filter/spamassassin/spamassassin-4.0.1.ebuild @@ -91,6 +91,7 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/spamassassin.apache.org.asc PATCHES=( "${FILESDIR}/mention-geoip.cf-in-init.pre.patch" "${FILESDIR}/4.0.0-tests-dnsbl_subtests.t_001_load-URIDNSBL.patch" + "${FILESDIR}/4.0.1-tests-sa_txrep.t-no-dbm.patch" ) # There are a few renames and use-dependent ones in src_install as well.
