From 394d293b09752268b841d5d7809d541b1f366f26 Mon Sep 17 00:00:00 2001 From: wpbirney Date: Sat, 21 Mar 2026 22:27:46 -0400 Subject: [PATCH] rspamd: update to 3.14.2 --- .../rspamd/patches/snowball-unbundle.patch | 25 ++++++++ srcpkgs/rspamd/patches/vsx.patch | 63 ------------------- srcpkgs/rspamd/template | 28 +++------ 3 files changed, 32 insertions(+), 84 deletions(-) create mode 100644 srcpkgs/rspamd/patches/snowball-unbundle.patch delete mode 100644 srcpkgs/rspamd/patches/vsx.patch diff --git a/srcpkgs/rspamd/patches/snowball-unbundle.patch b/srcpkgs/rspamd/patches/snowball-unbundle.patch new file mode 100644 index 00000000000000..fd320903d65606 --- /dev/null +++ b/srcpkgs/rspamd/patches/snowball-unbundle.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 98e8c2ec0..5f8939bb5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -131,7 +131,6 @@ include_directories( + "${CMAKE_SOURCE_DIR}/contrib/fpconv" + "${CMAKE_SOURCE_DIR}/contrib/libottery" + "${CMAKE_SOURCE_DIR}/contrib/cdb" +- "${CMAKE_SOURCE_DIR}/contrib/snowball/include" + "${CMAKE_SOURCE_DIR}/contrib/librdns" + "${CMAKE_SOURCE_DIR}/contrib/aho-corasick" + "${CMAKE_SOURCE_DIR}/contrib/lc-btrie" +diff --git a/cmake/AddDependencySubdirectories.cmake b/cmake/AddDependencySubdirectories.cmake +index 61781b511..560a4383e 100644 +--- a/cmake/AddDependencySubdirectories.cmake ++++ b/cmake/AddDependencySubdirectories.cmake +@@ -32,7 +32,6 @@ function(AddDependencySubdirectories) + + # Optional dependencies based on configuration + if (ENABLE_SNOWBALL) +- add_subdirectory(contrib/snowball) + set(WITH_SNOWBALL 1 PARENT_SCOPE) + endif () + +-- diff --git a/srcpkgs/rspamd/patches/vsx.patch b/srcpkgs/rspamd/patches/vsx.patch deleted file mode 100644 index ebcead9bdb9b1f..00000000000000 --- a/srcpkgs/rspamd/patches/vsx.patch +++ /dev/null @@ -1,63 +0,0 @@ -commit a6f43886153bfa63a609720e02bcc9c6f4a50140 -Author: q66 -Date: Mon Jan 6 00:48:43 2020 +0100 - - Disable VSX on platforms without it - -diff --git contrib/lua-torch/torch7/lib/TH/THVector.c contrib/lua-torch/torch7/lib/TH/THVector.c -index 4410578..c972b13 100644 ---- a/contrib/lua-torch/torch7/lib/TH/THVector.c -+++ b/contrib/lua-torch/torch7/lib/TH/THVector.c -@@ -6,7 +6,7 @@ - #include "vector/NEON.c" - #endif - --#ifdef __PPC64__ -+#if defined(__PPC64__) && defined(__VSX__) - #include "vector/VSX.c" - #endif - -diff --git contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c -index 5b88852..8ab4f67 100644 ---- a/contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c -+++ b/contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c -@@ -20,7 +20,7 @@ static FunctionDescription THVector_(fill_DISPATCHTABLE)[] = { - #endif - #endif - -- #if defined(__PPC64__) -+ #if defined(__PPC64__) && defined(__VSX__) - #if defined(TH_REAL_IS_DOUBLE) || defined(TH_REAL_IS_FLOAT) - FUNCTION_IMPL(THVector_(fill_VSX), SIMDExtension_VSX), - #endif -@@ -85,7 +85,7 @@ static FunctionDescription THVector_(adds_DISPATCHTABLE)[] = { - #endif - #endif - -- #if defined(__PPC64__) -+ #if defined(__PPC64__) && defined(__VSX__) - #if defined(TH_REAL_IS_DOUBLE) || defined(TH_REAL_IS_FLOAT) - FUNCTION_IMPL(THVector_(adds_VSX), SIMDExtension_VSX), - #endif -@@ -146,7 +146,7 @@ static FunctionDescription THVector_(muls_DISPATCHTABLE)[] = { - #endif - #endif - -- #if defined(__PPC64__) -+ #if defined(__PPC64__) && defined(__VSX__) - #if defined(TH_REAL_IS_DOUBLE) || defined(TH_REAL_IS_FLOAT) - FUNCTION_IMPL(THVector_(muls_VSX), SIMDExtension_VSX), - #endif -diff --git contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h -index 83c4c56..0919f73 100644 ---- a/contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h -+++ b/contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h -@@ -43,7 +43,7 @@ enum SIMDExtensions - { - #if defined(__NEON__) - SIMDExtension_NEON = 0x1, --#elif defined(__PPC64__) -+#elif defined(__PPC64__) && defined(__VSX__) - SIMDExtension_VSX = 0x1, - #else - SIMDExtension_AVX2 = 0x1, diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template index 87cbe96b8b957c..ba673819ad3c0b 100644 --- a/srcpkgs/rspamd/template +++ b/srcpkgs/rspamd/template @@ -1,21 +1,22 @@ # Template file for 'rspamd' pkgname=rspamd -version=1.9.4 -revision=11 -archs="x86_64* i686* aarch64* armv[67]* ppc64*" +version=3.14.2 +revision=1 +archs="x86_64* aarch64* armv[67]*" build_style=cmake configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd -DDBDIR=/var/lib/rspamd" hostmakedepends="perl pkg-config ragel" -makedepends="LuaJIT-devel fann-devel file-devel gd-devel pcre-devel - 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" short_desc="Fast, free and open-source spam filtering system" maintainer="Enno Boland " license="Apache-2.0" homepage="https://rspamd.com/" changelog="https://raw.githubusercontent.com/vstakhov/rspamd/master/ChangeLog" distfiles="https://github.com/vstakhov/rspamd/archive/${version}.tar.gz" -checksum=e4720c1f45defd07dd17b9563d0ddc480c70beadbc1a833235c077960092e030 +checksum=b8402b639b2480b793795907d53609f375fd19b99501f777ff49f2e410edfb5b system_accounts="rspamd" rspamd_homedir=/var/lib/rspamd conf_files="/etc/rspamd/*.conf /etc/rspamd/*.inc /etc/rspamd/modules.d/*.conf" @@ -27,21 +28,7 @@ case "$XBPS_TARGET_MACHINE" in -DHAVE_ATOMIC_BUILTINS_EXITCODE__TRYRUN_OUTPUT=0" esac -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" ${makedepends}" - - pre_build() { - make -C build_native/contrib/snowball - vsed -e "s#${wrksrc}/build/contrib/snowball/snowball#${wrksrc}/build_native/contrib/snowball/snowball#g" \ - -i build/build.ninja - } -fi - pre_configure() { - case "$XBPS_TARGET_MACHINE" in - *-musl) # Remove non existing library nsl - vsed -i CMakeLists.txt -e "/LIST(APPEND CMAKE_REQUIRED_LIBRARIES nsl)/d" - esac if [ "$CROSS_BUILD" ]; then configure_args+=" -C ${FILESDIR}/TryRunResults.cmake" mkdir -p build_native @@ -51,5 +38,4 @@ pre_configure() { post_install() { vsv rspamd - vlicense LICENSE.md }