4 files changed, 26 insertions, 50 deletions
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/rc.rspamd.new b/network/rspamd/rc.rspamd.new
index 02be8b85df..f68b62cb91 100644
--- a/network/rspamd/rc.rspamd.new
+++ b/network/rspamd/rc.rspamd.new
@@ -26,7 +26,7 @@ rspamd_start() {
   fi
 
   echo "Starting rspamd ..."
-  $DAEMON $DAEMON_ARGS
+  $DAEMON $DAEMON_ARGS &
 }
 
 rspamd_stop() {
diff --git a/network/rspamd/rspamd.SlackBuild b/network/rspamd/rspamd.SlackBuild
index 1ce8c078cc..071fadc54f 100644
--- a/network/rspamd/rspamd.SlackBuild
+++ b/network/rspamd/rspamd.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Rspamd
 
-# Copyright 2018-2020 Ebben Aries <e@dscp.org>
+# Copyright 2018-2024 Ebben Aries <slackbuilds@dscp.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,12 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220320 bkw: Modified by SlackBuilds.org: fix 32-bit build.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=rspamd
-VERSION=${VERSION:-2.7}
+VERSION=${VERSION:-3.8.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -38,20 +40,19 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-UIDGID=359
-if ! getent group $PRGNAM; then
-  echo "  You must have the \"$PRGNAM\" group to run this script."
+# 20220320 bkw: please don't make me run the script twice to see
+# both commands: show them both if either is missing.
+group_user_error() {
+  echo "  You must have the \"$PRGNAM\" group and user to run this script."
   echo "    # groupadd -g $UIDGID $PRGNAM"
-  exit 1
-elif ! getent passwd $PRGNAM; then
-  echo "  You must have the \"$PRGNAM\" user to run this script."
   echo "    # useradd -u $UIDGID -s /bin/false -d /dev/null -g $PRGNAM $PRGNAM"
   exit 1
-fi
+}
+
+UIDGID=359
+getent group  $PRGNAM || group_user_error
+getent passwd $PRGNAM || group_user_error
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -86,17 +87,12 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -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
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
-mkdir -p build
-cd build
-  export "PATH=/opt/cmake-202x/bin:$PATH"
+mkdir -p rspamd.build
+cd rspamd.build
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
@@ -106,18 +102,14 @@ cd build
     -DENABLE_STATIC=OFF \
     -DENABLE_HYPERSCAN=ON \
     -DENABLE_JEMALLOC=ON \
+    -DENABLE_LUAJIT=ON \
     -DENABLE_OPTIMIZATION=ON \
     -DCMAKE_BUILD_TYPE=Release \
     ..
   make
-  make install DESTDIR=$PKG
+  make install/strip DESTDIR=$PKG
 cd ..
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+gzip $PKG/usr/man/man*/*
 
 mkdir -p $PKG/var/log/rspamd
 chown rspamd:rspamd $PKG/var/log/rspamd
diff --git a/network/rspamd/rspamd.info b/network/rspamd/rspamd.info
index b4494074ca..a533c96955 100644
--- a/network/rspamd/rspamd.info
+++ b/network/rspamd/rspamd.info
@@ -1,10 +1,10 @@
 PRGNAM="rspamd"
-VERSION="2.7"
+VERSION="3.8.4"
 HOMEPAGE="https://rspamd.com"
-DOWNLOAD="https://github.com/rspamd/rspamd/archive/2.7/rspamd-2.7.tar.gz"
-MD5SUM="8125fd01e676c7624f077a2a58076e60"
+DOWNLOAD="https://github.com/rspamd/rspamd/archive/3.8.4/rspamd-3.8.4.tar.gz"
+MD5SUM="b0277cbdcca54bd6873b1fd2ea7e61de"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="ragel luajit redis hyperscan"
+REQUIRES="luajit redis hyperscan"
 MAINTAINER="Ebben Aries"
-EMAIL="e@dscp.org"
+EMAIL="slackbuilds@dscp.org"