Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/files/, mail-filter/rspamd/
Date: Sun, 06 Nov 2022 06:17:42
Message-Id: 1667715411.b022bb84a1fa213ed074ae78e01717683305ec75.sam@gentoo
1 commit: b022bb84a1fa213ed074ae78e01717683305ec75
2 Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
3 AuthorDate: Sat Nov 5 19:27:38 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 6 06:16:51 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b022bb84
7
8 mail-filter/rspamd: remove broken test case
9
10 Recent stabilization of luajit-2.1 triggered test phase failures related
11 to improperly designed test case. It was already removed from upstream,
12 see linked PR.
13
14 Upstream-PR: https://github.com/rspamd/rspamd/pull/4323
15 Bug: https://bugs.gentoo.org/879575
16 Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
17 Signed-off-by: Sam James <sam <AT> gentoo.org>
18
19 .../rspamd/files/rspamd-3.3-remove-test-case.patch | 20 ++++++++++++++++++++
20 mail-filter/rspamd/rspamd-3.3.ebuild | 1 +
21 2 files changed, 21 insertions(+)
22
23 diff --git a/mail-filter/rspamd/files/rspamd-3.3-remove-test-case.patch b/mail-filter/rspamd/files/rspamd-3.3-remove-test-case.patch
24 new file mode 100644
25 index 000000000000..0cad11382b21
26 --- /dev/null
27 +++ b/mail-filter/rspamd/files/rspamd-3.3-remove-test-case.patch
28 @@ -0,0 +1,20 @@
29 +Remove test case which does not work with luajit-2.1 anymore as it
30 +depends on internal behavior of lujait-2.0.
31 +
32 +Upstream-PR: https://github.com/rspamd/rspamd/pull/4323
33 +
34 +diff --git a/test/lua/unit/lua_util.extract_specific_urls.lua b/test/lua/unit/lua_util.extract_specific_urls.lua
35 +index 05ffeb7b0..a7e2f9f48 100644
36 +--- a/test/lua/unit/lua_util.extract_specific_urls.lua
37 ++++ b/test/lua/unit/lua_util.extract_specific_urls.lua
38 +@@ -108,7 +108,6 @@ context("Lua util - extract_specific_urls plain", function()
39 + local cases = {
40 + {expect = url_list, filter = nil, limit = 9999, need_emails = true, prefix = 'p'},
41 + {expect = {}, filter = (function() return false end), limit = 9999, need_emails = true, prefix = 'p'},
42 +- {expect = {"domain4.co.net", "test.com"}, filter = nil, limit = 2, need_emails = true, prefix = 'p'},
43 + {expect = {"domain4.co.net", "test.com", "domain3.org"}, filter = nil, limit = 3, need_emails = true, prefix = 'p'},
44 + {
45 + expect = {"gov.co.net", "tesco.co.net", "domain1.co.net", "domain2.co.net", "domain3.co.net", "domain4.co.net"},
46 +--
47 +2.37.4
48 +
49
50 diff --git a/mail-filter/rspamd/rspamd-3.3.ebuild b/mail-filter/rspamd/rspamd-3.3.ebuild
51 index b6932290133a..7231e72c2f72 100644
52 --- a/mail-filter/rspamd/rspamd-3.3.ebuild
53 +++ b/mail-filter/rspamd/rspamd-3.3.ebuild
54 @@ -70,6 +70,7 @@ PATCHES=(
55 "${FILESDIR}/rspamd-3.0-cmake-lua-version.patch"
56 "${FILESDIR}/rspamd-3.2-unbundle-lua.patch"
57 "${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
58 + "${FILESDIR}/rspamd-3.3-remove-test-case.patch"
59 )
60
61 src_prepare() {