update to rspamd 3.6

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 <[email protected]>"
 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,14 +38,20 @@ 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'
+	#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
+		# 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
 }