Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions srcpkgs/rspamd/patches/musl.patch

This file was deleted.

24 changes: 24 additions & 0 deletions srcpkgs/rspamd/patches/snowball-unbundle.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
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 ()

63 changes: 0 additions & 63 deletions srcpkgs/rspamd/patches/vsx.patch

This file was deleted.

29 changes: 9 additions & 20 deletions srcpkgs/rspamd/template
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
# Template file for 'rspamd'
pkgname=rspamd
version=1.9.4
revision=12
archs="x86_64* i686* aarch64* armv[67]* ppc64*"
version=3.14.2
revision=1
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 pcre2-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
checksum=b8402b639b2480b793795907d53609f375fd19b99501f777ff49f2e410edfb5b
system_accounts="rspamd"
rspamd_homedir=/var/lib/rspamd
conf_files="/etc/rspamd/*.conf /etc/rspamd/*.inc /etc/rspamd/modules.d/*.conf"
Expand All @@ -27,28 +26,18 @@ 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() {
if [ "$XBPS_TARGET_LIBC" = musl ]; then
vsed -i CMakeLists.txt -e "/LIST(APPEND CMAKE_REQUIRED_LIBRARIES nsl)/d"
fi
if [ "$CROSS_BUILD" ]; then
configure_args+=" -C ${FILESDIR}/TryRunResults.cmake"
mkdir -p build_native
( cd build_native; LD= CC= CFLAGS= LDFLAGS= cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 .. )
fi
}

pre_check() {
export LUA_PATH="${wrksrc}/lualib/?.lua;${wrksrc}/lualib/?/?.lua;${wrksrc}/lualib/?/init.lua;${wrksrc}/contrib/lua-?/?.lua"
}

post_install() {
vsv rspamd
vlicense LICENSE.md
}
Loading