aboutsummaryrefslogtreecommitdiffstats
path: root/community
diff options
context:
space:
mode:
Diffstat (limited to 'community')
-rw-r--r--community/rspamd/07-hyperscan.patch73
-rw-r--r--community/rspamd/08-errors.patch24
-rw-r--r--community/rspamd/09-lua-suffix.patch18
-rw-r--r--community/rspamd/APKBUILD14
4 files changed, 4 insertions, 125 deletions
diff --git a/community/rspamd/07-hyperscan.patch b/community/rspamd/07-hyperscan.patch
deleted file mode 100644
index 85d0457df9..0000000000
--- a/community/rspamd/07-hyperscan.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -Nurp a/cmake/Hyperscan.cmake b.hyperscan/cmake/Hyperscan.cmake
---- a/cmake/Hyperscan.cmake 2020-09-30 20:27:23.000000000 +0100
-+++ b.hyperscan/cmake/Hyperscan.cmake 2020-12-28 15:58:12.603285789 +0000
-@@ -1,9 +1,6 @@
- option (ENABLE_HYPERSCAN "Enable hyperscan for fast regexp processing [default: OFF]" OFF)
-
- if (ENABLE_HYPERSCAN MATCHES "ON")
-- if (NOT ("${ARCH}" STREQUAL "x86_64" OR "${ARCH}" STREQUAL "i386"))
-- MESSAGE(FATAL_ERROR "Hyperscan is supported only on x86_64/i386 architectures")
-- endif ()
- ProcessPackage (HYPERSCAN LIBRARY hs INCLUDE hs.h INCLUDE_SUFFIXES
- hs include/hs
- ROOT ${HYPERSCAN_ROOT_DIR} MODULES libhs)
-@@ -16,4 +13,4 @@ if (ENABLE_HYPERSCAN MATCHES "ON")
- set (USE_CXX_LINKER 1)
- endif ()
- endif ()
--endif ()
-\ No newline at end of file
-+endif ()
-diff -Nurp a/src/hs_helper.c b.hyperscan/src/hs_helper.c
---- a/src/hs_helper.c 2020-09-30 20:27:23.000000000 +0100
-+++ b.hyperscan/src/hs_helper.c 2020-12-28 20:17:33.697849599 +0000
-@@ -247,11 +247,13 @@ static gboolean
- rspamd_rs_compile (struct hs_helper_ctx *ctx, struct rspamd_worker *worker,
- gboolean forced)
- {
-+#ifndef __aarch64__
- if (!(ctx->cfg->libs_ctx->crypto_ctx->cpu_config & CPUID_SSSE3)) {
- msg_warn ("CPU doesn't have SSSE3 instructions set "
- "required for hyperscan, disable hyperscan compilation");
- return FALSE;
- }
-+#endif
-
- if (!rspamd_hs_helper_cleanup_dir (ctx, forced)) {
- msg_warn ("cannot cleanup cache dir '%s'", ctx->hs_dir);
-diff -Nurp a/src/libserver/cfg_utils.c b.hyperscan/src/libserver/cfg_utils.c
---- a/src/libserver/cfg_utils.c 2020-09-30 20:27:23.000000000 +0100
-+++ b.hyperscan/src/libserver/cfg_utils.c 2020-12-28 20:15:35.322542255 +0000
-@@ -816,7 +816,7 @@ rspamd_config_post_load (struct rspamd_c
- rspamd_regexp_library_init (cfg);
- rspamd_multipattern_library_init (cfg->hs_cache_dir);
-
--#ifdef WITH_HYPERSCAN
-+#if defined(WITH_HYPERSCAN) && !defined(__aarch64__)
- if (!cfg->disable_hyperscan) {
- if (!(cfg->libs_ctx->crypto_ctx->cpu_config & CPUID_SSSE3)) {
- msg_warn_config ("CPU doesn't have SSSE3 instructions set "
-diff -Nurp a/src/libserver/maps/map_helpers.c b.hyperscan/src/libserver/maps/map_helpers.c
---- a/src/libserver/maps/map_helpers.c 2020-09-30 20:27:23.000000000 +0100
-+++ b.hyperscan/src/libserver/maps/map_helpers.c 2020-12-28 20:19:16.289253951 +0000
-@@ -942,11 +942,13 @@ rspamd_re_map_finalize (struct rspamd_re
-
- map = re_map->map;
-
-+#ifndef __aarch64__
- if (!(map->cfg->libs_ctx->crypto_ctx->cpu_config & CPUID_SSSE3)) {
- msg_info_map ("disable hyperscan for map %s, ssse3 instructons are not supported by CPU",
- map->name);
- return;
- }
-+#endif
-
- if (hs_populate_platform (&plt) != HS_SUCCESS) {
- msg_err_map ("cannot populate hyperscan platform");
-@@ -1572,4 +1574,4 @@ rspamd_match_cdb_map (struct rspamd_cdb_
- }
-
- return NULL;
--}
-\ No newline at end of file
-+}
diff --git a/community/rspamd/08-errors.patch b/community/rspamd/08-errors.patch
deleted file mode 100644
index cbfd21d586..0000000000
--- a/community/rspamd/08-errors.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nurp a/CMakeLists.txt b.allerrors/CMakeLists.txt
---- a/CMakeLists.txt 2020-09-30 20:27:23.000000000 +0100
-+++ b.allerrors/CMakeLists.txt 2020-12-27 18:35:06.703013307 +0000
-@@ -23,6 +23,8 @@ SET(RSPAMD_VERSION "${RSPAMD_VER
-
- PROJECT(rspamd VERSION "${RSPAMD_VERSION}" LANGUAGES C CXX ASM)
-
-+CMAKE_POLICY(SET CMP0075 NEW)
-+
- # This is supported merely with cmake 3.1
- SET(CMAKE_C_STANDARD 11)
- SET(CMAKE_C_STANDARD_REQUIRED ON)
-diff -Nurp a/contrib/mumhash/mum.h b.allerrors/contrib/mumhash/mum.h
---- a/contrib/mumhash/mum.h 2020-09-30 20:27:23.000000000 +0100
-+++ b.allerrors/contrib/mumhash/mum.h 2020-12-27 18:05:30.916331886 +0000
-@@ -115,7 +115,7 @@ _mum (uint64_t v, uint64_t p) {
- multiplication. If we use a generic code we actually call a
- function doing 128x128->128 bit multiplication. The function is
- very slow. */
-- lo = v * p, hi;
-+ lo = v * p;
- __asm__ ("umulh %0, %1, %2" : "=r" (hi) : "r" (v), "r" (p));
- #else
- __uint128_t r = (__uint128_t) v * (__uint128_t) p;
diff --git a/community/rspamd/09-lua-suffix.patch b/community/rspamd/09-lua-suffix.patch
deleted file mode 100644
index a468665b82..0000000000
--- a/community/rspamd/09-lua-suffix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -140,6 +140,7 @@
-
- ProcessPackage(LIBLUA LIBRARY "lua"
- "lua-5.3"
-+ LIB_SUFFIXES "lua5.3"
- INCLUDE lua.h INCLUDE_SUFFIXES
- "include/lua-5.3"
- "include/lua5.3"
-@@ -152,6 +153,7 @@
- IF (NOT WITH_LIBLUA)
- ProcessPackage(LIBLUA LIBRARY "lua"
- "lua-5.2"
-+ LIB_SUFFIXES "lua5.2"
- INCLUDE lua.h INCLUDE_SUFFIXES
- "include/lua-5.2"
- "include/lua5.2"
diff --git a/community/rspamd/APKBUILD b/community/rspamd/APKBUILD
index 5cb5850ad9..dd9a148b05 100644
--- a/community/rspamd/APKBUILD
+++ b/community/rspamd/APKBUILD
@@ -5,8 +5,8 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Contributor: Duncan Bellamy <dunk@denkimushi.com>
pkgname=rspamd
-pkgver=2.6
-pkgrel=5
+pkgver=2.7
+pkgrel=0
pkgdesc="Fast, free and open-source spam filtering system"
url="https://rspamd.com/"
arch="all"
@@ -49,9 +49,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/rspamd/rspamd/archive/$pkgve
30-conf-split-workers.patch
20-default-configs.patch
10-control_socket.patch
- 09-lua-suffix.patch
- 08-errors.patch
- 07-hyperscan.patch
"
case "$CARCH" in
@@ -175,13 +172,10 @@ proxy() {
amove etc/$pkgname/worker-proxy.*
}
-sha512sums="79e4c1aa763aef753c8d7b2a941ed92b384e96c25e6d1b3bd1321c5acc0ecb934d033a3bf19cb94c89809fd92edec25192cffe97de9e5251681e1a71216b734a rspamd-2.6.tar.gz
+sha512sums="8779771baf85ef6ca1d7d2180429072ab1547ab834b073ee9222dcc6494efdd0a23f5e7ac52a777c23fd89296769f5b6f182593e714097c6f11ca7c9165e4ba7 rspamd-2.7.tar.gz
2efe28575c40d1fba84b189bb872860e744400db80dce2f6330be6c6287fb3f46e6511284729b957488bf40bcb9b0952e26df9934f5f138334bd2766075c45cb rspamd.logrotated
782e1126d32e450a1db0ac822c127b9a763f903093f200bdf603a6a0610a853671b94c89b0bb2d8ebdfb065e0cf62be51c1c7f451e8da34e25f252a276c2b0f3 rspamd.initd
a2003ef0c9d64a44480f59302864a2dfedcbe3a0047fcbb655408bc8aae9014b6ad0ddc6b64d4abeeb21bea0f86678afd30589ac8eed83e07ad7f87710e93702 rspamd.confd
a8aefee649bf6630339d1d3f2bb20c25ca70b21a8eaa92951e926d0fd4525f1d4ac4cc7ea66ac2b15323cf02c93c759ddf7181502f0d71b21384ced9d88c008e 30-conf-split-workers.patch
8801e3af59886847c25c87ca2f231cd9ededf35f376f9920967e72696fb017b1a4312f3a49017b52f65556bfe5c9f74a80405643afa32bb2906c38d39c5e1818 20-default-configs.patch
-6f828601ce460f2fd3b1c430974b719e36b0aa5600bd7074683fd646d99a4e76da35840b54c50416a9ae6d87babe39c5d463fc2ec05814e164a96d16f5da18b7 10-control_socket.patch
-e5812075511c27e0fb4539812c23b2baa9dcde8e418fe842f2ea38d2723b2c370918bb7c1f0f96ab9c3a5f46bfddb62f1a58ff3c483f57235a8f878423bdd122 09-lua-suffix.patch
-d13b07ec403209ab0b62cb309c43eca483888d10c127a83ce1358439af88802616477e57f530064f178d64bdea63555e581ef07ee41c70eab03014804144e0f4 08-errors.patch
-7f138e70a5b4abed50bdc121894d40447f397516b8fd84fe78eb2e0d8a7e7cee5969c590defaf1b7e9325809e578e522c3b1216b006066aeda2ce99eecc84444 07-hyperscan.patch"
+6f828601ce460f2fd3b1c430974b719e36b0aa5600bd7074683fd646d99a4e76da35840b54c50416a9ae6d87babe39c5d463fc2ec05814e164a96d16f5da18b7 10-control_socket.patch"