summaryrefslogtreecommitdiff
path: root/mail-filter/rspamd/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-05-29 15:17:30 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-05-29 15:17:30 +0100
commit662f71ae67cd775d7fbb79b5091676c0e07a992b (patch)
tree74c7cb80b79b8886cd7466cf262878d1e8b9d546 /mail-filter/rspamd/files
parentb2d3769042cfd3d8ceadaa52f6a5aafabb0d4114 (diff)
gentoo auto-resync : 29:05:2023 - 15:17:30
Diffstat (limited to 'mail-filter/rspamd/files')
-rw-r--r--mail-filter/rspamd/files/rspamd-3.3-remove-test-case.patch20
-rw-r--r--mail-filter/rspamd/files/rspamd-3.4-gcc-13.patch30
-rw-r--r--mail-filter/rspamd/files/rspamd-3.4-hyperscan-page-alignment.patch28
3 files changed, 0 insertions, 78 deletions
diff --git a/mail-filter/rspamd/files/rspamd-3.3-remove-test-case.patch b/mail-filter/rspamd/files/rspamd-3.3-remove-test-case.patch
deleted file mode 100644
index 0cad11382b21..000000000000
--- a/mail-filter/rspamd/files/rspamd-3.3-remove-test-case.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Remove test case which does not work with luajit-2.1 anymore as it
-depends on internal behavior of lujait-2.0.
-
-Upstream-PR: https://github.com/rspamd/rspamd/pull/4323
-
-diff --git a/test/lua/unit/lua_util.extract_specific_urls.lua b/test/lua/unit/lua_util.extract_specific_urls.lua
-index 05ffeb7b0..a7e2f9f48 100644
---- a/test/lua/unit/lua_util.extract_specific_urls.lua
-+++ b/test/lua/unit/lua_util.extract_specific_urls.lua
-@@ -108,7 +108,6 @@ context("Lua util - extract_specific_urls plain", function()
- local cases = {
- {expect = url_list, filter = nil, limit = 9999, need_emails = true, prefix = 'p'},
- {expect = {}, filter = (function() return false end), limit = 9999, need_emails = true, prefix = 'p'},
-- {expect = {"domain4.co.net", "test.com"}, filter = nil, limit = 2, need_emails = true, prefix = 'p'},
- {expect = {"domain4.co.net", "test.com", "domain3.org"}, filter = nil, limit = 3, need_emails = true, prefix = 'p'},
- {
- expect = {"gov.co.net", "tesco.co.net", "domain1.co.net", "domain2.co.net", "domain3.co.net", "domain4.co.net"},
---
-2.37.4
-
diff --git a/mail-filter/rspamd/files/rspamd-3.4-gcc-13.patch b/mail-filter/rspamd/files/rspamd-3.4-gcc-13.patch
deleted file mode 100644
index f660b353fec7..000000000000
--- a/mail-filter/rspamd/files/rspamd-3.4-gcc-13.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://github.com/rspamd/rspamd/commit/0a916c632e18e6686e1a2256d5ef2fe1a1cc239f
-
-From 0a916c632e18e6686e1a2256d5ef2fe1a1cc239f Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Wed, 18 Jan 2023 23:54:24 +0100
-Subject: [PATCH] Fix build with gcc 13 by including <cstdint>
-
-Like other versions before, gcc 13 moved some includes around and as a
-result <cstdint> is no longer transitively included. Explicitly include
-it for uint8_t.
---- a/src/libserver/css/css_tokeniser.hxx
-+++ b/src/libserver/css/css_tokeniser.hxx
-@@ -24,6 +24,7 @@
- #include <variant>
- #include <list>
- #include <functional>
-+#include <cstdint>
- #include "mem_pool.h"
-
- namespace rspamd::css {
---- a/src/libserver/html/html_tag.hxx
-+++ b/src/libserver/html/html_tag.hxx
-@@ -23,6 +23,7 @@
- #include <variant>
- #include <vector>
- #include <optional>
-+#include <cstdint>
-
- #include "html_tags.h"
-
diff --git a/mail-filter/rspamd/files/rspamd-3.4-hyperscan-page-alignment.patch b/mail-filter/rspamd/files/rspamd-3.4-hyperscan-page-alignment.patch
deleted file mode 100644
index 913f1f7ecd4d..000000000000
--- a/mail-filter/rspamd/files/rspamd-3.4-hyperscan-page-alignment.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Fix for hyperscan page alignment issues.
-
-Upstream-Issue: https://github.com/rspamd/rspamd/issues/4329
-
-diff --git a/src/libserver/hyperscan_tools.cxx b/src/libserver/hyperscan_tools.cxx
-index 6187208a9..96366067d 100644
---- a/src/libserver/hyperscan_tools.cxx
-+++ b/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 });
- }
---
-2.37.4
-