4 files changed, 5 insertions, 74 deletions

diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index 54e266061668..67d0ae6f9275 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rspamd
-PORTVERSION=	2.3
+PORTVERSION=	2.4
 CATEGORIES=	mail
 
 MAINTAINER=	vsevolod@FreeBSD.org
@@ -84,7 +84,6 @@ post-install:
 	# Linux specific
 	${RM} ${STAGEDIR}/${ETCDIR}/rspamd.systemd.conf
 	${RM} ${STAGEDIR}/${ETCDIR}/rspamd.sysvinit.conf
-	# No examples installed by the port
 	${INSTALL_DATA} ${WRKDIR}/rspamd.newsyslog.conf.sample ${STAGEDIR}${ETCDIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
 	${LN} -s ${ETCDIR}/rspamd.newsyslog.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo
index 79cf300d3cfe..cbcfc7ad481c 100644
--- a/mail/rspamd/distinfo
+++ b/mail/rspamd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1580833267
-SHA256 (rspamd-rspamd-2.3_GH0.tar.gz) = 994f737875b6159225384606076798687a529336d66496781a83de9164b6d41b
-SIZE (rspamd-rspamd-2.3_GH0.tar.gz) = 4409924
+TIMESTAMP = 1582747300
+SHA256 (rspamd-rspamd-2.4_GH0.tar.gz) = 3b4e7171d1d45e8fe4bba59b3f47fed55c1f63ef9f3a191fe9e22cc6c1204d9d
+SIZE (rspamd-rspamd-2.4_GH0.tar.gz) = 4462119
diff --git a/mail/rspamd/files/patch-fips b/mail/rspamd/files/patch-fips
deleted file mode 100644
index 808f08d53766..000000000000
--- a/mail/rspamd/files/patch-fips
+++ /dev/null
@@ -1,69 +0,0 @@
-From 963657514d24c29604e0b873c17dcee0d3efd345 Mon Sep 17 00:00:00 2001
-From: Vsevolod Stakhov <vsevolod@highsecure.ru>
-Date: Fri, 7 Feb 2020 13:18:32 +0000
-Subject: [PATCH] [Minor] Add explicit checks for FIPS mode presence
-
----
- CMakeLists.txt     | 11 +++++++++++
- config.h.in        |  1 +
- src/libutil/util.c |  4 ++++
- 3 files changed, 16 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 29986a740..a41dd8abb 100644
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -331,8 +331,19 @@ CHECK_SYMBOL_EXISTS(I_SETSIG "sys/types.h;sys/ioctl.h" HAVE_SETSIG)
- CHECK_SYMBOL_EXISTS(O_ASYNC "sys/types.h;sys/fcntl.h" HAVE_OASYNC)
- CHECK_SYMBOL_EXISTS(O_NOFOLLOW "sys/types.h;sys/fcntl.h" HAVE_ONOFOLLOW)
- CHECK_SYMBOL_EXISTS(O_CLOEXEC "sys/types.h;sys/fcntl.h" HAVE_OCLOEXEC)
-+
-+# OpenSSL specific stuff
- LIST(APPEND CMAKE_REQUIRED_INCLUDES "${LIBSSL_INCLUDE}")
-+IF(LIBCRYPT_LIBRARY_PATH)
-+	SET(CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES};-L${LIBCRYPT_LIBRARY_PATH};${LIBCRYPT_LIBRARY}")
-+	SET(CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES};-L${LIBSSL_LIBRARY_PATH};${LIBSSL_LIBRARY}")
-+ELSE()
-+	SET(CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES};-lcrypt;-lssl")
-+ENDIF()
-+
- CHECK_SYMBOL_EXISTS(SSL_set_tlsext_host_name "openssl/ssl.h" HAVE_SSL_TLSEXT_HOSTNAME)
-+CHECK_SYMBOL_EXISTS(FIPS_mode "openssl/crypto.h" HAVE_FIPS_MODE)
-+
- CHECK_SYMBOL_EXISTS(dirfd "sys/types.h;unistd.h;dirent.h" HAVE_DIRFD)
- CHECK_SYMBOL_EXISTS(fpathconf "sys/types.h;unistd.h" HAVE_FPATHCONF)
- CHECK_SYMBOL_EXISTS(sigaltstack "signal.h" HAVE_SIGALTSTACK)
-diff --git a/config.h.in b/config.h.in
-index c2d73a0a9..b3aefd980 100644
---- config.h.in.orig
-+++ config.h.in
-@@ -32,6 +32,7 @@
- #cmakedefine HAVE_FCNTL_H        1
- #cmakedefine HAVE_FDATASYNC      1
- #cmakedefine HAVE_FETCH_H        1
-+#cmakedefine HAVE_FIPS_MODE      1
- #cmakedefine HAVE_FLOCK          1
- #cmakedefine HAVE_FPATHCONF      1
- #cmakedefine HAVE_GETPAGESIZE    1
-diff --git a/src/libutil/util.c b/src/libutil/util.c
-index 3256becb9..119082964 100644
---- src/libutil/util.c.orig
-+++ src/libutil/util.c
-@@ -2484,6 +2484,7 @@ rspamd_config_libs (struct rspamd_external_libs_ctx *ctx,
- 		}
- 
- 		if (cfg->fips_mode) {
-+#ifdef HAVE_FIPS_MODE
- 			int mode = FIPS_mode ();
- 			unsigned long err = (unsigned long)-1;
- 
-@@ -2505,6 +2506,9 @@ rspamd_config_libs (struct rspamd_external_libs_ctx *ctx,
- 			else {
- 				msg_info_config ("OpenSSL FIPS mode is enabled");
- 			}
-+#else
-+			msg_warn_config ("SSL FIPS mode is enabled but not supported by OpenSSL library!");
-+#endif
- 		}
- 
- 		if (cfg->ssl_ca_path) {
diff --git a/mail/rspamd/pkg-plist b/mail/rspamd/pkg-plist
index 2aa94b9c30ff..ceb191cb59b2 100644
--- a/mail/rspamd/pkg-plist
+++ b/mail/rspamd/pkg-plist
@@ -199,6 +199,7 @@ man/man8/rspamd.8.gz
 %%DATADIR%%/lualib/lua_smtp.lua
 %%DATADIR%%/lualib/lua_stat.lua
 %%DATADIR%%/lualib/lua_tcp_sync.lua
+%%DATADIR%%/lualib/lua_urls_compose.lua
 %%DATADIR%%/lualib/lua_util.lua
 %%DATADIR%%/lualib/lua_verdict.lua
 %%DATADIR%%/lualib/lupa.lua