From 1dbc9b649858a02062bb5bbacf56e3b09bda9dbe Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 7 Jan 2024 16:10:48 +0100 Subject: [PATCH] rspamd: update to 3.7.5. --- srcpkgs/rspamd/patches/vsx.patch | 63 -------------------------------- srcpkgs/rspamd/template | 10 ++--- 2 files changed, 4 insertions(+), 69 deletions(-) delete mode 100644 srcpkgs/rspamd/patches/vsx.patch diff --git a/srcpkgs/rspamd/patches/vsx.patch b/srcpkgs/rspamd/patches/vsx.patch deleted file mode 100644 index ebcead9bdb9b1..0000000000000 --- 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 87cbe96b8b957..528a7d428d448 100644 --- a/srcpkgs/rspamd/template +++ b/srcpkgs/rspamd/template @@ -1,21 +1,20 @@ # Template file for 'rspamd' pkgname=rspamd -version=1.9.4 -revision=11 +version=3.7.5 +revision=1 archs="x86_64* i686* aarch64* armv[67]* ppc64*" 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" 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=3fba8b0086fe68ac16146cfc25cfcff352bff52fa5cef7d277007ed008170330 system_accounts="rspamd" rspamd_homedir=/var/lib/rspamd conf_files="/etc/rspamd/*.conf /etc/rspamd/*.inc /etc/rspamd/modules.d/*.conf" @@ -51,5 +50,4 @@ pre_configure() { post_install() { vsv rspamd - vlicense LICENSE.md }