aboutsummaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorYasuhiro Kimura <yasu@FreeBSD.org>2022-03-26 18:19:02 +0000
committerYasuhiro Kimura <yasu@FreeBSD.org>2022-03-28 01:53:11 +0000
commit380b24898c268c717e22f638019dc86b05363164 (patch)
tree683c1d4a729cfe504529bd97ca88709cb8455055 /mail
parentb175bebd581e22598609a2dbf75a435e919198dc (diff)
downloadports-380b24898c268c717e22f638019dc86b05363164.tar.gz
ports-380b24898c268c717e22f638019dc86b05363164.zip
mail/rspamd: Update to 3.2
Switch to use PCRE2. ReleaseNotes: https://rspamd.com/announce/2022/03/26/rspamd-3.2.html PR: 262839 Approved by: maintainer
Diffstat (limited to 'mail')
-rw-r--r--mail/rspamd/Makefile11
-rw-r--r--mail/rspamd/distinfo6
-rw-r--r--mail/rspamd/files/patch-contrib_xxhash_xxhash.h10
-rw-r--r--mail/rspamd/pkg-plist5
4 files changed, 23 insertions, 9 deletions
diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index b5408a3d0221..f180130f19ce 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -1,5 +1,5 @@
PORTNAME= rspamd
-PORTVERSION= 3.1
+PORTVERSION= 3.2
CATEGORIES= mail
MAINTAINER= vsevolod@FreeBSD.org
@@ -10,7 +10,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md
BUILD_DEPENDS= ragel:devel/ragel
LIB_DEPENDS= libicui18n.so:devel/icu \
- libpcre.so:devel/pcre \
+ libpcre2-8.so:devel/pcre2 \
libsodium.so:security/libsodium
RUN_DEPENDS= ca_root_nss>=3.*:security/ca_root_nss
@@ -79,12 +79,11 @@ LUAJIT_CMAKE_OFF= -DENABLE_LUAJIT=OFF
.include <bsd.port.options.mk>
-.if ${ARCH:Mpowerpc64*}
-LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty
-.endif
-
.if ${ARCH} == powerpc64
CMAKE_ARGS+= -DENABLE_LTO:BOOL=OFF
+LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty
+.elif ${ARCH} == powerpc64le
+LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty
.endif
post-install:
diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo
index 0188501a4ea7..403541cc408f 100644
--- a/mail/rspamd/distinfo
+++ b/mail/rspamd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1635790047
-SHA256 (rspamd-rspamd-3.1_GH0.tar.gz) = 7f37514f16f4d194cacaef9f54eeead73ae2c208bc4439fd7f1de4e220f9db30
-SIZE (rspamd-rspamd-3.1_GH0.tar.gz) = 5566920
+TIMESTAMP = 1648307312
+SHA256 (rspamd-rspamd-3.2_GH0.tar.gz) = 5152d601a634ebeda1327056d4ef21cc012e30f88fce9b8c1ca55d532128a98b
+SIZE (rspamd-rspamd-3.2_GH0.tar.gz) = 5637835
diff --git a/mail/rspamd/files/patch-contrib_xxhash_xxhash.h b/mail/rspamd/files/patch-contrib_xxhash_xxhash.h
new file mode 100644
index 000000000000..ffd646edb20a
--- /dev/null
+++ b/mail/rspamd/files/patch-contrib_xxhash_xxhash.h
@@ -0,0 +1,10 @@
+--- contrib/xxhash/xxhash.h.orig 2021-03-31 12:18:19 UTC
++++ contrib/xxhash/xxhash.h
+@@ -2409,6 +2409,7 @@ XXH_PUBLIC_API XXH64_hash_t XXH64_hashFromCanonical(co
+ # if defined(__GNUC__) && !defined(__APPLE_ALTIVEC__)
+ # define __APPLE_ALTIVEC__
+ # endif
++# define vector __vector
+ # include <altivec.h>
+ # endif
+
diff --git a/mail/rspamd/pkg-plist b/mail/rspamd/pkg-plist
index a6b71d7eb030..3a3c560ef5d0 100644
--- a/mail/rspamd/pkg-plist
+++ b/mail/rspamd/pkg-plist
@@ -26,6 +26,7 @@ etc/newsyslog.conf.d/rspamd.newsyslog.conf
%%ETCDIR%%/modules.d/arc.conf
%%ETCDIR%%/modules.d/asn.conf
%%ETCDIR%%/modules.d/aws_s3.conf
+%%ETCDIR%%/modules.d/bimi.conf
%%ETCDIR%%/modules.d/chartable.conf
%%ETCDIR%%/modules.d/clickhouse.conf
%%ETCDIR%%/modules.d/dcc.conf
@@ -183,6 +184,7 @@ man/man8/rspamd.8.gz
%%DATADIR%%/lualib/lua_redis.lua
%%DATADIR%%/lualib/lua_scanners/avast.lua
%%DATADIR%%/lualib/lua_scanners/clamav.lua
+%%DATADIR%%/lualib/lua_scanners/cloudmark.lua
%%DATADIR%%/lualib/lua_scanners/common.lua
%%DATADIR%%/lualib/lua_scanners/dcc.lua
%%DATADIR%%/lualib/lua_scanners/fprot.lua
@@ -231,6 +233,7 @@ man/man8/rspamd.8.gz
%%DATADIR%%/lualib/rspamadm/keypair.lua
%%DATADIR%%/lualib/rspamadm/mime.lua
%%DATADIR%%/lualib/rspamadm/neural_test.lua
+%%DATADIR%%/lualib/rspamadm/publicsuffix.lua
%%DATADIR%%/lualib/rspamadm/rescore.lua
%%DATADIR%%/lualib/rspamadm/stat_convert.lua
%%DATADIR%%/lualib/rspamadm/statistics_dump.lua
@@ -242,6 +245,7 @@ man/man8/rspamd.8.gz
%%DATADIR%%/plugins/asn.lua
%%DATADIR%%/plugins/aws_s3.lua
%%DATADIR%%/plugins/bayes_expiry.lua
+%%DATADIR%%/plugins/bimi.lua
%%DATADIR%%/plugins/clickhouse.lua
%%DATADIR%%/plugins/clustering.lua
%%DATADIR%%/plugins/dcc.lua
@@ -309,6 +313,7 @@ man/man8/rspamd.8.gz
%%DATADIR%%/www/css/FooTable.Glyphicons.css
%%DATADIR%%/www/css/bootstrap.min.css
%%DATADIR%%/www/css/d3evolution.css
+%%DATADIR%%/www/css/d3pie.css
%%DATADIR%%/www/css/font-glyphicons.css
%%DATADIR%%/www/css/footable.standalone.min.css
%%DATADIR%%/www/css/nprogress.css