Skip to content

Commit 2f3a890

Browse files
wpbirneyDuncaen
authored andcommitted
rspamd: update to 3.14.2
1 parent e7742a8 commit 2f3a890

4 files changed

Lines changed: 33 additions & 93 deletions

File tree

srcpkgs/rspamd/patches/musl.patch

Lines changed: 0 additions & 10 deletions
This file was deleted.
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 98e8c2ec0..5f8939bb5 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -131,7 +131,6 @@ include_directories(
6+
"${CMAKE_SOURCE_DIR}/contrib/fpconv"
7+
"${CMAKE_SOURCE_DIR}/contrib/libottery"
8+
"${CMAKE_SOURCE_DIR}/contrib/cdb"
9+
- "${CMAKE_SOURCE_DIR}/contrib/snowball/include"
10+
"${CMAKE_SOURCE_DIR}/contrib/librdns"
11+
"${CMAKE_SOURCE_DIR}/contrib/aho-corasick"
12+
"${CMAKE_SOURCE_DIR}/contrib/lc-btrie"
13+
diff --git a/cmake/AddDependencySubdirectories.cmake b/cmake/AddDependencySubdirectories.cmake
14+
index 61781b511..560a4383e 100644
15+
--- a/cmake/AddDependencySubdirectories.cmake
16+
+++ b/cmake/AddDependencySubdirectories.cmake
17+
@@ -32,7 +32,6 @@ function(AddDependencySubdirectories)
18+
19+
# Optional dependencies based on configuration
20+
if (ENABLE_SNOWBALL)
21+
- add_subdirectory(contrib/snowball)
22+
set(WITH_SNOWBALL 1 PARENT_SCOPE)
23+
endif ()
24+

srcpkgs/rspamd/patches/vsx.patch

Lines changed: 0 additions & 63 deletions
This file was deleted.

srcpkgs/rspamd/template

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
# Template file for 'rspamd'
22
pkgname=rspamd
3-
version=1.9.4
4-
revision=12
5-
archs="x86_64* i686* aarch64* armv[67]* ppc64*"
3+
version=3.14.2
4+
revision=1
65
build_style=cmake
76
configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
87
-DDBDIR=/var/lib/rspamd"
98
hostmakedepends="perl pkg-config ragel"
10-
makedepends="LuaJIT-devel fann-devel file-devel gd-devel pcre-devel
11-
hiredis-devel icu-devel libevent-devel sqlite-devel libglib-devel"
9+
makedepends="LuaJIT-devel libsodium-devel zlib-devel glib-devel openssl-devel
10+
icu-devel sqlite-devel libstemmer-devel libarchive-devel pcre2-devel"
1211
short_desc="Fast, free and open-source spam filtering system"
1312
maintainer="Enno Boland <gottox@voidlinux.org>"
1413
license="Apache-2.0"
1514
homepage="https://rspamd.com/"
1615
changelog="https://raw.githubusercontent.com/vstakhov/rspamd/master/ChangeLog"
1716
distfiles="https://github.com/vstakhov/rspamd/archive/${version}.tar.gz"
18-
checksum=e4720c1f45defd07dd17b9563d0ddc480c70beadbc1a833235c077960092e030
17+
checksum=b8402b639b2480b793795907d53609f375fd19b99501f777ff49f2e410edfb5b
1918
system_accounts="rspamd"
2019
rspamd_homedir=/var/lib/rspamd
2120
conf_files="/etc/rspamd/*.conf /etc/rspamd/*.inc /etc/rspamd/modules.d/*.conf"
@@ -27,28 +26,18 @@ case "$XBPS_TARGET_MACHINE" in
2726
-DHAVE_ATOMIC_BUILTINS_EXITCODE__TRYRUN_OUTPUT=0"
2827
esac
2928

30-
if [ "$CROSS_BUILD" ]; then
31-
hostmakedepends+=" ${makedepends}"
32-
33-
pre_build() {
34-
make -C build_native/contrib/snowball
35-
vsed -e "s#${wrksrc}/build/contrib/snowball/snowball#${wrksrc}/build_native/contrib/snowball/snowball#g" \
36-
-i build/build.ninja
37-
}
38-
fi
39-
4029
pre_configure() {
41-
if [ "$XBPS_TARGET_LIBC" = musl ]; then
42-
vsed -i CMakeLists.txt -e "/LIST(APPEND CMAKE_REQUIRED_LIBRARIES nsl)/d"
43-
fi
4430
if [ "$CROSS_BUILD" ]; then
4531
configure_args+=" -C ${FILESDIR}/TryRunResults.cmake"
4632
mkdir -p build_native
4733
( cd build_native; LD= CC= CFLAGS= LDFLAGS= cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 .. )
4834
fi
4935
}
5036

37+
pre_check() {
38+
export LUA_PATH="${wrksrc}/lualib/?.lua;${wrksrc}/lualib/?/?.lua;${wrksrc}/lualib/?/init.lua;${wrksrc}/contrib/lua-?/?.lua"
39+
}
40+
5141
post_install() {
5242
vsv rspamd
53-
vlicense LICENSE.md
5443
}

0 commit comments

Comments
 (0)