From nobody Sat Mar 18 01:47:58 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PdkR248YBz407B1; Sat, 18 Mar 2023 01:47:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PdkR21mmtz4HjS; Sat, 18 Mar 2023 01:47:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679104078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lt9hAq8LpKIhm9uVUM5PngNsWeNOrgFOyRvgr9sYLxM=; b=D8aitqW4n/Lj97cLLmvPe40KPBYZrTtqc4XZTgKiA+2AeSA3hi8I4wNvk50MWnYEAfW0oT u+5J8SVfmo845ui1MyVGFggKiHSxS1/GF0OziWhg72D7QmT3E4PDsi8bEfKVNAMGT4R5m1 hTDqYG7QPPXQykycMmODL/BA96EpFY0Ot5w5vsgMUn14JvJu5vEV+Wkx62tNJ6JUJbiWL1 voFn3pv2tqtsCi9vOi1bQuXNoPzjGJI9W/E6E8D1ZPQJfspJCVn9RlVHCVkGIItpJYPOYZ M0vNwk9cM93ofB9Fn0+xHmsTinmSjS+DyoPPm+J1lJCvxHubdTyiadFSpEaRlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679104078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lt9hAq8LpKIhm9uVUM5PngNsWeNOrgFOyRvgr9sYLxM=; b=qVohUEFx9MSpO9YsUtQMM1GDNkC1/qetv4IiywFKcH3F8I7qObtcjZFSIEGK1MiZtkCXfX wT4g3TIs7SoREP6drfSw9UfLie+PtDpwN56MH7D1LHI2RleQB8L9IfFTMCWtMpd6Udc6GN HyNBv+Nz9aBtvYs0zw0LF13h5qJ2aUbYeeMQN1zBcdD13160Zxr0lbhTDGTY7SDtgpoJKb yE+C7O3ZcsyWpe+eNzeN8BoF7Ra4hosxMTzoOuh8pUqTiCctk+KArVlZV4uWSX/cZU2Z0o Vt9dYqtN8bM29jauTkz0NyqFWxBhoPDHmiK4s2tnEeWrYuADC9cBNrXQaYUhQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679104078; a=rsa-sha256; cv=none; b=gcNkzDmDNB616lFs8ahE8gOB77pleaMc0bL7WVJqZ6j01lRhTwM0dKl2mQ6pWs7v+fGZQg eeHGDJceTVkSLXrmQzvc3XB5HjzLfYLFkhVbt1OOSsCuC70HyCFZzR0rLAAfsnh5HH9SO9 z/HVS0L6gFBZIsIO8bNlE3E1CloOxkfSiDsCJqeBwSkbW3vE2RA3MZ2hihphzIuu3xGwcd C6x0LzEG4Pgi1zs/LqJi/rcRMLfDLExNcqRB5rz+3WWzMSFpyWOyn/1YRAqZLhWvC8xE0P 2MFQzpyyiJ1Mb6a7noYnFLFwTcBg+wvvWYsrxhVEc8g51oDU0dr7CqCexDvV7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PdkR20szYzpSH; Sat, 18 Mar 2023 01:47:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32I1lw38076689; Sat, 18 Mar 2023 01:47:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32I1lwne076688; Sat, 18 Mar 2023 01:47:58 GMT (envelope-from git) Date: Sat, 18 Mar 2023 01:47:58 GMT Message-Id: <202303180147.32I1lwne076688@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: 27e618aefe3e - main - mail/rspamd: Update to 3.5 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 27e618aefe3e2732ca8214a28dfde0887cfb18f4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=27e618aefe3e2732ca8214a28dfde0887cfb18f4 commit 27e618aefe3e2732ca8214a28dfde0887cfb18f4 Author: Yasuhiro Kimura AuthorDate: 2023-03-17 17:58:02 +0000 Commit: Yasuhiro Kimura 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