network/rspamd: Updated for version 2.5.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

6 files changed, 35 insertions, 15 deletions

diff --git a/network/rspamd/README b/network/rspamd/README
index 705ffd1689cc..ea65f2a21ea2 100644
--- a/network/rspamd/README
+++ b/network/rspamd/README
@@ -13,7 +13,8 @@ available.
 
 Groupname and Username
 
-You must have the "rspamd" group and user to run this script, for example:
+You must have the "rspamd" group and user to run this script, for
+example:
 
   groupadd -g 359 rspamd
   useradd -u 359 -s /bin/false -d /dev/null -g rspamd rspamd
diff --git a/network/rspamd/Toolset.cmake.patch b/network/rspamd/Toolset.cmake.patch
new file mode 100644
index 000000000000..f70735d89980
--- /dev/null
+++ b/network/rspamd/Toolset.cmake.patch
@@ -0,0 +1,16 @@
+--- 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/doinst.sh b/network/rspamd/doinst.sh
index 533485ecf56c..116a6481e52f 100644
--- a/network/rspamd/doinst.sh
+++ b/network/rspamd/doinst.sh
@@ -22,5 +22,7 @@ preserve_perms() {
   config $NEW
 }
 
-config etc/rspamd/rspamd.conf.new
+find etc/rspamd -type f -name '*.new' \
+ | while read new ; do config $new ; done
+
 preserve_perms etc/rc.d/rc.rspamd.new
diff --git a/network/rspamd/rspamd.SlackBuild b/network/rspamd/rspamd.SlackBuild
index 1821c2026b10..2f477747be84 100644
--- a/network/rspamd/rspamd.SlackBuild
+++ b/network/rspamd/rspamd.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Rspamd
 
-# Copyright 2018, 2019 Ebben Aries <e@dscp.org>
+# Copyright 2018-2020 Ebben Aries <e@dscp.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=rspamd
-VERSION=${VERSION:-1.9.4}
+VERSION=${VERSION:-2.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -80,6 +80,10 @@ 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
+
 mkdir -p build
 cd build
   cmake \
@@ -104,9 +108,6 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 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
 
-# remove empty directory tree
-rmdir -p --ignore-fail-on-non-empty $PKG/usr/share/examples/rspamd
-
 mkdir -p $PKG/var/log/rspamd
 chown rspamd:rspamd $PKG/var/log/rspamd
 chmod 0755 $PKG/var/log/rspamd
diff --git a/network/rspamd/rspamd.info b/network/rspamd/rspamd.info
index 0fd4280c318c..56f48ff7f9de 100644
--- a/network/rspamd/rspamd.info
+++ b/network/rspamd/rspamd.info
@@ -1,8 +1,8 @@
 PRGNAM="rspamd"
-VERSION="1.9.4"
+VERSION="2.5"
 HOMEPAGE="https://rspamd.com"
-DOWNLOAD="https://github.com/rspamd/rspamd/archive/1.9.4/rspamd-1.9.4.tar.gz"
-MD5SUM="930b07b1f55dfc9c46abbe266eae9856"
+DOWNLOAD="https://github.com/rspamd/rspamd/archive/2.5/rspamd-2.5.tar.gz"
+MD5SUM="9b70be38ca7e17ee89373b764fef1ea7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ragel luajit redis hyperscan"
diff --git a/network/rspamd/slack-desc b/network/rspamd/slack-desc
index 7419034a6b5f..5fd336b92a81 100644
--- a/network/rspamd/slack-desc
+++ b/network/rspamd/slack-desc
@@ -7,13 +7,13 @@
 
       |-----handy-ruler------------------------------------------------------|
 rspamd: rspamd (An advanced spam filtering system)
+rspamd:
 rspamd: Rspamd is an advanced spam filtering system that allows evaluation of
 rspamd: messages by a number of rules including regular expressions,
 rspamd: statistical analysis and custom services such as URL black lists.
 rspamd: Each message is analysed by Rspamd and given a spam score.
-rspamd: According to the spam score and the user's settings Rspamd recommends
-rspamd: an action for the MTA to apply to the message: for example, to pass,
-rspamd: to reject or to add a header. Rspamd is designed to process hundreds
-rspamd: of messages per second simultaneously and has a number of features
-rspamd: available.
+rspamd:
 rspamd: Home-Page: https://rspamd.com
+rspamd:
+rspamd:
+rspamd: