From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1638473-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 2E4A715817D
for <garchives@archives.gentoo.org>; Mon, 3 Jun 2024 01:31:32 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 700922BC013;
Mon, 3 Jun 2024 01:31:31 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 4C5032BC013
for <gentoo-commits@lists.gentoo.org>; Mon, 3 Jun 2024 01:31:31 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 6F4453409C8
for <gentoo-commits@lists.gentoo.org>; Mon, 3 Jun 2024 01:31:30 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id CE2891BFA
for <gentoo-commits@lists.gentoo.org>; Mon, 3 Jun 2024 01:31:28 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1717378261.ef3433e77824185dca2aff5a495d8611d28a3179.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/spamassassin/, mail-filter/spamassassin/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: mail-filter/spamassassin/files/4.0.1-tests-sa_txrep.t-no-dbm.patch mail-filter/spamassassin/spamassassin-4.0.1.ebuild
X-VCS-Directories: mail-filter/spamassassin/files/ mail-filter/spamassassin/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: ef3433e77824185dca2aff5a495d8611d28a3179
X-VCS-Branch: master
Date: Mon, 3 Jun 2024 01:31:28 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 4763ff49-81e1-41fa-ac87-0f5f9ba04fc9
X-Archives-Hash: 17a7b59bb5084cc37fc0bc9b9bbde9b7
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.