Skip to content

rspamd: update to 3.14.2#59509

Merged
Duncaen merged 1 commit intovoid-linux:masterfrom
wpbirney:rspamd
Mar 25, 2026
Merged

rspamd: update to 3.14.2#59509
Duncaen merged 1 commit intovoid-linux:masterfrom
wpbirney:rspamd

Conversation

@wpbirney
Copy link
Contributor

Testing the changes

  • I tested the changes in this PR: YES

Local build testing

  • I built this PR locally for my native architecture, (x86_64-glibc)
  • I built this PR locally for these architectures (if supported. mark crossbuilds):
    • aarch64-musl

Updated #48104 to 3.14.2

Current packaged rspamd is ~7 years old

@wpbirney wpbirney force-pushed the rspamd branch 2 times, most recently from be28689 to e8a3cea Compare March 22, 2026 03:07
@wpbirney
Copy link
Contributor Author

wpbirney commented Mar 22, 2026

not quite sure why some failed checks for lua_stat as the package does provide it. I currently have this PR running on a a x86_64-musl and and x86_64-glibc with postfix on one and opensmtpd on the other working good

Will dig into it today

edit

  • Added rspamd as a checkdepend since the cmake tests require the lua scripts to be in specific location. Can also patch the tests to remove the need for this. Seemed cleaner to use checkdepends
  • Used the patch from alpine that unbundles snowball so we use our libstemmer. which fixed arm builds.
  • Removed i686 as it was failing a lot of tests. Will try to get this one working as well.

@wpbirney wpbirney marked this pull request as draft March 22, 2026 15:59
@wpbirney wpbirney marked this pull request as ready for review March 22, 2026 18:01
@sgn sgn requested a review from classabbyamp March 24, 2026 08:58
archs="x86_64* i686* aarch64* armv[67]* ppc64*"
version=3.14.2
revision=1
archs="x86_64* aarch64* armv[67]*"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you remove i686*?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was failing tests during ./xbps-src check

However it does build and pkg fine. I did some basic testing (GTUBE and basic spam checking) with the i686 build and it seems to work correctly.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the archs line can probably be removed alltogether

hiredis-devel icu-devel libevent-devel sqlite-devel libglib-devel"
makedepends="LuaJIT-devel libsodium-devel zlib-devel glib-devel openssl-devel
icu-devel sqlite-devel libstemmer-devel libarchive-devel"
checkdepends="rspamd"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can't checkdepend on itself

archs="x86_64* i686* aarch64* armv[67]* ppc64*"
version=3.14.2
revision=1
archs="x86_64* aarch64* armv[67]*"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the archs line can probably be removed alltogether

@wpbirney
Copy link
Contributor Author

Thanks!

removed checkdepends="rspamd" and replaced with setting the LUA_PATH in the pre_check()

for some reason the rspamd CMakeLists.txt COMMAND is not working with ./xbps-src check, https://github.com/rspamd/rspamd/blob/a7fba3381f04f56dc8465e3790c3d518749c4062/CMakeLists.txt#L345

which required me to either set LUA_PATH manually or rely on the package being installed during the test to get it to pass.

i686 is failing tests with

Assert failed: expected String conversion test: '42' doesn't match with '-966794217751838678'
stack traceback:
	/builddir/rspamd-3.14.2/build/test/lua/telescope.lua:202: in function 'assert_equal'
	/builddir/rspamd-3.14.2/build/test/lua/unit/logger.lua:189: in function </builddir/rspamd-3.14.2/build/test/lua/unit/logger.lua:103>
	[C]: in function 'xpcall'
	/builddir/rspamd-3.14.2/build/test/lua/telescope.lua:444: in function 'invoke_test'
	/builddir/rspamd-3.14.2/build/test/lua/telescope.lua:484: in function 'run'
	/builddir/rspamd-3.14.2/build/test/lua/tests.lua:28: in main chunk

However it does seem to work on i686 with my limited testing with a opensmtpd + rspamd filter

@Duncaen Duncaen merged commit 2f3a890 into void-linux:master Mar 25, 2026
0 of 8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants