Re: [PR PATCH] [Updated] update to rspamd 3.6

[adrian-bl <adrian-bl@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 474 bytes --]

There is an updated pull request by adrian-bl against master on the void-packages repository

https://github.com/adrian-bl/void-packages rspam
https://github.com/void-linux/void-packages/pull/45873

update to rspamd 3.6
#### 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)

A patch file from https://github.com/void-linux/void-packages/pull/45873.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rspam-45873.patch --]
[-- Type: text/x-diff, Size: 5311 bytes --]

From fd1606e468766877672c6a95f1c0669a82cf7b66 Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Fri, 1 Sep 2023 18:25:59 +0200
Subject: [PATCH] update to rspamd 3.6

---
 srcpkgs/rspamd/patches/vsx.patch | 63 --------------------------------
 srcpkgs/rspamd/template          | 25 +++++++------
 2 files changed, 13 insertions(+), 75 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 <daniel@octaforge.org>
-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..7c5431bfa3d29 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,21 +1,21 @@
 # Template file for 'rspamd'
 pkgname=rspamd
-version=1.9.4
-revision=11
+version=3.6
+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"
+ hiredis-devel icu-devel libevent-devel sqlite-devel libglib-devel libsodium-devel"
 short_desc="Fast, free and open-source spam filtering system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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
+changelog="https://raw.githubusercontent.com/rspamd/rspamd/master/ChangeLog"
+distfiles="https://github.com/rspamd/rspamd/archive/${version}.tar.gz"
+checksum=bae279f6365f709db9fc3af2dba0babcb8d19da4b0095953eb94f37b6733d5f7
 system_accounts="rspamd"
 rspamd_homedir=/var/lib/rspamd
 conf_files="/etc/rspamd/*.conf /etc/rspamd/*.inc /etc/rspamd/modules.d/*.conf"
@@ -38,18 +38,19 @@ if [ "$CROSS_BUILD" ]; then
 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
+	# cmake will pick up gold which may not be available on the target arch
+	# since there is no real reason to use it, just skip the attempt to detect it (which
+	# may pick up the host ld.gold while configuring cross compiling)
+	vsed -i cmake/Toolset.cmake -e '/find_program(GOLD_PATH NAMES "ld.gold" "gold")/d'
+
 	if [ "$CROSS_BUILD" ]; then
+		# for building contrib/snowball:
 		configure_args+=" -C ${FILESDIR}/TryRunResults.cmake"
 		mkdir -p build_native
-		( cd build_native; LD= CC= CFLAGS= LDFLAGS= cmake .. )
+		( cd build_native; env -i PATH=$PATH cmake .. )
 	fi
 }
 
 post_install() {
 	vsv rspamd
-	vlicense LICENSE.md
 }