git: 27e618aefe3e - main - mail/rspamd: Update to 3.5

The branch main has been updated by yasu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=27e618aefe3e2732ca8214a28dfde0887cfb18f4

commit 27e618aefe3e2732ca8214a28dfde0887cfb18f4
Author:     Yasuhiro Kimura <yasu@FreeBSD.org>
AuthorDate: 2023-03-17 17:58:02 +0000
Commit:     Yasuhiro Kimura <yasu@FreeBSD.org>
CommitDate: 2023-03-18 01:47:32 +0000

    mail/rspamd: Update to 3.5
    
    ChangeLog:      https://github.com/rspamd/rspamd/releases/tag/3.5
    PR:             270288
    Approved by:    maintainer
---
 mail/rspamd/Makefile                               |  3 +--
 mail/rspamd/distinfo                               |  6 +++---
 .../files/patch-src_libserver_hyperscan_tools.cxx  | 21 ---------------------
 .../files/patch-src_libutil_cxx_file_util.cxx      | 22 ----------------------
 mail/rspamd/pkg-plist                              |  2 +-
 5 files changed, 5 insertions(+), 49 deletions(-)

diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index a3810ab16f4e..95f73aa16a1b 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	rspamd
-PORTVERSION=	3.4
-PORTREVISION=	1
+PORTVERSION=	3.5
 CATEGORIES=	mail
 
 MAINTAINER=	vsevolod@FreeBSD.org
diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo
index ef53fa374864..22884e8a0181 100644
--- a/mail/rspamd/distinfo
+++ b/mail/rspamd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1667340889
-SHA256 (rspamd-rspamd-3.4_GH0.tar.gz) = f8d3e2b9a1a6ed6521c60fe505e97086624407f67366f0ce882eee433a53c355
-SIZE (rspamd-rspamd-3.4_GH0.tar.gz) = 5689732
+TIMESTAMP = 1679068454
+SHA256 (rspamd-rspamd-3.5_GH0.tar.gz) = 2d6bd94942acdd3203cf31ef023eb2356c74d5f0e834b7a0e2017004d4ad5938
+SIZE (rspamd-rspamd-3.5_GH0.tar.gz) = 5806722
diff --git a/mail/rspamd/files/patch-src_libserver_hyperscan_tools.cxx b/mail/rspamd/files/patch-src_libserver_hyperscan_tools.cxx
deleted file mode 100644
index 72eb1173ae88..000000000000
--- a/mail/rspamd/files/patch-src_libserver_hyperscan_tools.cxx
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/libserver/hyperscan_tools.cxx b/src/libserver/hyperscan_tools.cxx
-index 6187208a9..96366067d 100644
---- src/libserver/hyperscan_tools.cxx
-+++ src/libserver/hyperscan_tools.cxx
-@@ -306,7 +306,15 @@ auto load_cached_hs_file(const char *fname, std::int64_t offset = 0) -> tl::expe
- 						msg_debug_hyperscan_lambda("multipattern: create new database in %s; %Hz size",
- 							tmpfile_pattern.data(), unserialized_size);
- 						void *buf;
--						posix_memalign(&buf, 16, unserialized_size);
-+#ifdef HAVE_GETPAGESIZE
-+						auto page_size = getpagesize();
-+#else
-+						auto page_size = sysconf(_SC_PAGESIZE);
-+#endif
-+						if (page_size == -1) {
-+							page_size = 4096;
-+						}
-+						posix_memalign(&buf, page_size, unserialized_size);
- 						if (buf == nullptr) {
- 							return tl::make_unexpected(error {"Cannot allocate memory", errno, error_category::CRITICAL });
- 						}
diff --git a/mail/rspamd/files/patch-src_libutil_cxx_file_util.cxx b/mail/rspamd/files/patch-src_libutil_cxx_file_util.cxx
deleted file mode 100644
index f7461da0c82b..000000000000
--- a/mail/rspamd/files/patch-src_libutil_cxx_file_util.cxx
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/libutil/cxx/file_util.cxx b/src/libutil/cxx/file_util.cxx
-index e3b3a2605..4536fa97b 100644
---- src/libutil/cxx/file_util.cxx
-+++ src/libutil/cxx/file_util.cxx
-@@ -198,7 +198,7 @@ auto raii_mmaped_file::mmap_shared(raii_file &&file,
- 	}
- 	/* Update stat on file to ensure it is up-to-date */
- 	file.update_stat();
--	map = mmap(nullptr, file.get_size() - offset, flags, MAP_SHARED, file.get_fd(), offset);
-+	map = mmap(nullptr, (std::size_t)(file.get_size() - offset), flags, MAP_SHARED, file.get_fd(), offset);
- 
- 	if (map == MAP_FAILED) {
- 		return tl::make_unexpected(error { fmt::format("cannot mmap file {}: {}",
-@@ -206,7 +206,7 @@ auto raii_mmaped_file::mmap_shared(raii_file &&file,
- 
- 	}
- 
--	return raii_mmaped_file{std::move(file), map,  file.get_size() - offset};
-+	return raii_mmaped_file{std::move(file), map,  (std::size_t)(file.get_size() - offset)};
- }
- 
- auto raii_mmaped_file::mmap_shared(const char *fname, int open_flags,
diff --git a/mail/rspamd/pkg-plist b/mail/rspamd/pkg-plist
index bfb2f837b039..98fd546be9a2 100644
--- a/mail/rspamd/pkg-plist
+++ b/mail/rspamd/pkg-plist
@@ -345,7 +345,7 @@ man/man8/rspamd.8.gz
 %%DATADIR%%/www/js/lib/d3pie.min.js
 %%DATADIR%%/www/js/lib/fontawesome.min.js
 %%DATADIR%%/www/js/lib/footable.min.js
-%%DATADIR%%/www/js/lib/jquery-3.6.1.min.js
+%%DATADIR%%/www/js/lib/jquery-3.6.3.min.js
 %%DATADIR%%/www/js/lib/jquery.stickytabs.min.js
 %%DATADIR%%/www/js/lib/linenumbers.min.js
 %%DATADIR%%/www/js/lib/nprogress.min.js