summaryrefslogtreecommitdiffstats
path: root/network/rspamd
diff options
context:
space:
mode:
Diffstat (limited to 'network/rspamd')
-rw-r--r--network/rspamd/0007-fix-i386-compilation.patch110
-rw-r--r--network/rspamd/Toolset.cmake.patch16
-rw-r--r--network/rspamd/rspamd.SlackBuild18
-rw-r--r--network/rspamd/rspamd.info8
4 files changed, 10 insertions, 142 deletions
diff --git a/network/rspamd/0007-fix-i386-compilation.patch b/network/rspamd/0007-fix-i386-compilation.patch
deleted file mode 100644
index 0c1dda747a..0000000000
--- a/network/rspamd/0007-fix-i386-compilation.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From: Vsevolod Stakhov <vsevolod@highsecure.ru>
-From: Duncan Bellamy <dunk@denkimushi.com>
-Subject: [Fix] Restrict x86_64 assembly to x86_64
-Origin: upstream, https://github.com/rspamd/rspamd/commit/f6dc828c3d8c015779eea7fb662198c6d58def14
-Origin: upstream, https://github.com/rspamd/rspamd/commit/eee7acb309bae98e17c19b53bbd72cc9b798c281
-Origin: upstream, https://github.com/rspamd/rspamd/commit/9766a457eb860b2eeb5e3e37ff86e82e89fe8c8d
-
----
- src/libcryptobox/CMakeLists.txt | 19 +++++++++++++------
- src/libcryptobox/chacha20/chacha.c | 12 ++++++------
- src/libcryptobox/cryptobox.c | 4 ++--
- 3 files changed, 21 insertions(+), 14 deletions(-)
-
-diff --git a/src/libcryptobox/CMakeLists.txt b/src/libcryptobox/CMakeLists.txt
-index 272701b..a7f8665 100644
---- a/src/libcryptobox/CMakeLists.txt
-+++ b/src/libcryptobox/CMakeLists.txt
-@@ -5,17 +5,24 @@ SET(BASE64SRC ${CMAKE_CURRENT_SOURCE_DIR}/base64/ref.c
- ${CMAKE_CURRENT_SOURCE_DIR}/base64/base64.c)
-
- IF(HAVE_AVX2)
-- SET(CHACHASRC ${CHACHASRC} ${CMAKE_CURRENT_SOURCE_DIR}/chacha20/avx2.S)
-+ IF ("${ARCH}" STREQUAL "x86_64")
-+ SET(CHACHASRC ${CHACHASRC} ${CMAKE_CURRENT_SOURCE_DIR}/chacha20/avx2.S)
-+ MESSAGE(STATUS "Cryptobox: AVX2 support is added (chacha20)")
-+ ENDIF()
- SET(BASE64SRC ${BASE64SRC} ${CMAKE_CURRENT_SOURCE_DIR}/base64/avx2.c)
-- MESSAGE(STATUS "Cryptobox: AVX2 support is added (chacha20, avx2)")
-+ MESSAGE(STATUS "Cryptobox: AVX2 support is added (base64)")
- ENDIF(HAVE_AVX2)
- IF(HAVE_AVX)
-- SET(CHACHASRC ${CHACHASRC} ${CMAKE_CURRENT_SOURCE_DIR}/chacha20/avx.S)
-- MESSAGE(STATUS "Cryptobox: AVX support is added (chacha20)")
-+ IF ("${ARCH}" STREQUAL "x86_64")
-+ SET(CHACHASRC ${CHACHASRC} ${CMAKE_CURRENT_SOURCE_DIR}/chacha20/avx.S)
-+ MESSAGE(STATUS "Cryptobox: AVX support is added (chacha20)")
-+ ENDIF()
- ENDIF(HAVE_AVX)
- IF(HAVE_SSE2)
-- SET(CHACHASRC ${CHACHASRC} ${CMAKE_CURRENT_SOURCE_DIR}/chacha20/sse2.S)
-- MESSAGE(STATUS "Cryptobox: SSE2 support is added (chacha20)")
-+ IF ("${ARCH}" STREQUAL "x86_64")
-+ SET(CHACHASRC ${CHACHASRC} ${CMAKE_CURRENT_SOURCE_DIR}/chacha20/sse2.S)
-+ MESSAGE(STATUS "Cryptobox: SSE2 support is added (chacha20)")
-+ ENDIF()
- ENDIF(HAVE_SSE2)
- IF(HAVE_SSE42)
- SET(BASE64SRC ${BASE64SRC} ${CMAKE_CURRENT_SOURCE_DIR}/base64/sse42.c)
-diff --git a/src/libcryptobox/chacha20/chacha.c b/src/libcryptobox/chacha20/chacha.c
-index e4543d3..653c614 100644
---- a/src/libcryptobox/chacha20/chacha.c
-+++ b/src/libcryptobox/chacha20/chacha.c
-@@ -52,15 +52,15 @@ typedef struct chacha_impl_t {
- #define CHACHA_IMPL(cpuflags, desc, ext) \
- {(cpuflags), desc, chacha_##ext, xchacha_##ext, chacha_blocks_##ext, hchacha_##ext}
-
--#if defined(HAVE_AVX2)
-+#if defined(HAVE_AVX2) && defined(__x86_64__)
- CHACHA_DECLARE(avx2)
- #define CHACHA_AVX2 CHACHA_IMPL(CPUID_AVX2, "avx2", avx2)
- #endif
--#if defined(HAVE_AVX)
-+#if defined(HAVE_AVX) && defined(__x86_64__)
- CHACHA_DECLARE(avx)
- #define CHACHA_AVX CHACHA_IMPL(CPUID_AVX, "avx", avx)
- #endif
--#if defined(HAVE_SSE2)
-+#if defined(HAVE_SSE2) && defined(__x86_64__)
- CHACHA_DECLARE(sse2)
- #define CHACHA_SSE2 CHACHA_IMPL(CPUID_SSE2, "sse2", sse2)
- #endif
-@@ -70,13 +70,13 @@ CHACHA_DECLARE(ref)
-
- static const chacha_impl_t chacha_list[] = {
- CHACHA_GENERIC,
--#if defined(CHACHA_AVX2)
-+#if defined(CHACHA_AVX2) && defined(__x86_64__)
- CHACHA_AVX2,
- #endif
--#if defined(CHACHA_AVX)
-+#if defined(CHACHA_AVX) && defined(__x86_64__)
- CHACHA_AVX,
- #endif
--#if defined(CHACHA_SSE2)
-+#if defined(CHACHA_SSE2) && defined(__x86_64__)
- CHACHA_SSE2
- #endif
- };
-diff --git a/src/libcryptobox/cryptobox.c b/src/libcryptobox/cryptobox.c
-index 3139bb1..f34cd13 100644
---- a/src/libcryptobox/cryptobox.c
-+++ b/src/libcryptobox/cryptobox.c
-@@ -118,7 +118,7 @@ rspamd_cryptobox_test_instr (gint instr)
- }
-
- switch (instr) {
--#ifdef HAVE_SSE2
-+#if defined HAVE_SSE2 && defined (__x86_64__)
- case CPUID_SSE2:
- __asm__ volatile ("psubb %xmm0, %xmm0");
- break;
-@@ -146,7 +146,7 @@ rspamd_cryptobox_test_instr (gint instr)
- __asm__ volatile ("pcmpeqq %xmm0, %xmm0");
- break;
- #endif
--#ifdef HAVE_SSE42
-+#if defined HAVE_SSE42 && defined(__x86_64__)
- case CPUID_SSE42:
- __asm__ volatile ("pushq %rax\n"
- "xorq %rax, %rax\n"
diff --git a/network/rspamd/Toolset.cmake.patch b/network/rspamd/Toolset.cmake.patch
deleted file mode 100644
index f70735d899..0000000000
--- a/network/rspamd/Toolset.cmake.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- cmake/Toolset.cmake 2020-09-23 18:31:57.275661294 -0600
-+++ cmake/Toolset.cmake 2020-09-23 18:32:34.812659218 -0600
-@@ -45,10 +45,10 @@
- find_program(GOLD_PATH NAMES "ld.gold" "gold")
-
- if(NOT LINKER_NAME)
-- if(LLD_PATH)
-- set(LINKER_NAME "lld")
-- elseif(GOLD_PATH)
-+ if(GOLD_PATH)
- set(LINKER_NAME "gold")
-+ elseif(LLD_PATH)
-+ set(LINKER_NAME "lld")
- else()
- message(STATUS "Use generic 'ld' as a linker")
- endif()
diff --git a/network/rspamd/rspamd.SlackBuild b/network/rspamd/rspamd.SlackBuild
index 8c7ebddcf2..ab56b2ca68 100644
--- a/network/rspamd/rspamd.SlackBuild
+++ b/network/rspamd/rspamd.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for Rspamd
-# Copyright 2018-2021 Ebben Aries <slackbuilds@dscp.org>
+# Copyright 2018-2024 Ebben Aries <slackbuilds@dscp.org>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=rspamd
-VERSION=${VERSION:-3.1}
+VERSION=${VERSION:-3.9.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -91,15 +91,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
-# Patch to use correct linker
-# https://github.com/rspamd/rspamd/issues/3168#issuecomment-583849873
-patch -p0 < $CWD/Toolset.cmake.patch
-
-# 20220320 bkw: patch from Debian, allows building on 32-bit.
-patch -p1 < $CWD/0007-fix-i386-compilation.patch
-
-mkdir -p build
-cd build
+mkdir -p rspamd.build
+cd rspamd.build
cmake \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_INSTALL_PREFIX=/usr \
@@ -109,10 +102,11 @@ cd build
-DENABLE_STATIC=OFF \
-DENABLE_HYPERSCAN=ON \
-DENABLE_JEMALLOC=ON \
+ -DENABLE_LUAJIT=ON \
-DENABLE_OPTIMIZATION=ON \
-DCMAKE_BUILD_TYPE=Release \
..
- make VERBOSE=1
+ make
make install/strip DESTDIR=$PKG
cd ..
gzip $PKG/usr/man/man*/*
diff --git a/network/rspamd/rspamd.info b/network/rspamd/rspamd.info
index 40a4102733..ed627dbf5c 100644
--- a/network/rspamd/rspamd.info
+++ b/network/rspamd/rspamd.info
@@ -1,10 +1,10 @@
PRGNAM="rspamd"
-VERSION="3.1"
+VERSION="3.9.1"
HOMEPAGE="https://rspamd.com"
-DOWNLOAD="https://github.com/rspamd/rspamd/archive/3.1/rspamd-3.1.tar.gz"
-MD5SUM="8b87ee04a0ec561e81ecf8808a5f9f95"
+DOWNLOAD="https://github.com/rspamd/rspamd/archive/3.9.1/rspamd-3.9.1.tar.gz"
+MD5SUM="a64f0808c8e4ac7a8d70d51668b85f6f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="ragel luajit redis hyperscan"
+REQUIRES="luajit redis hyperscan"
MAINTAINER="Ebben Aries"
EMAIL="slackbuilds@dscp.org"
generated by cgit v1.2.3 (git 2.32.0) at 2024-09-23 02:13:47 +0200