update to rspamd-2.7

This commit is contained in:
sthen 2021-01-09 12:50:09 +00:00
parent d2fcae116c
commit 69379f9bce
5 changed files with 20 additions and 14 deletions

View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.88 2020/12/25 21:44:43 sthen Exp $
# $OpenBSD: Makefile,v 1.89 2021/01/09 12:50:09 sthen Exp $
COMMENT= event-driven spam filtering system in C/Lua
GH_ACCOUNT= vstakhov
GH_PROJECT= rspamd
GH_TAGNAME= 2.6
REVISION= 2
GH_TAGNAME= 2.7
CATEGORIES= mail

View File

@ -1,2 +1,2 @@
SHA256 (rspamd-2.6.tar.gz) = ACruR9xNb4xsBXK1jMsMvLubt2iUQsM6Wlz4k+clBts=
SIZE (rspamd-2.6.tar.gz) = 5079444
SHA256 (rspamd-2.7.tar.gz) = 4mBsGPDZsefu6GkHvYVF4Nzag7FkLd9YkV1dRKU+PfA=
SIZE (rspamd-2.7.tar.gz) = 5126227

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-CMakeLists_txt,v 1.25 2020/10/02 18:51:13 sthen Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.26 2021/01/09 12:50:09 sthen Exp $
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -365,7 +365,7 @@ IF(LIBCRYPT_LIBRARY_PATH)
@@ -369,7 +369,7 @@ 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()

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-cmake_Toolset_cmake,v 1.4 2020/10/02 18:51:13 sthen Exp $
$OpenBSD: patch-cmake_Toolset_cmake,v 1.5 2021/01/09 12:50:09 sthen Exp $
Fails on ports-gcc arches: see CMakeError.log
@ -7,7 +7,7 @@ egcc: error: unrecognized command line option '-fuse-ld=lld'; did you mean '-fus
Index: cmake/Toolset.cmake
--- cmake/Toolset.cmake.orig
+++ cmake/Toolset.cmake
@@ -54,7 +54,7 @@ if(NOT LINKER_NAME)
@@ -55,7 +55,7 @@ if(NOT LINKER_NAME)
endif()
endif()
@ -16,7 +16,7 @@ Index: cmake/Toolset.cmake
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=${LINKER_NAME}")
set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=${LINKER_NAME}")
@@ -134,8 +134,8 @@ if (COMPILER_GCC)
@@ -135,8 +135,8 @@ if (COMPILER_GCC)
set (CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE} -O2 ${COMPILER_FAST_MATH} ${COMPILER_DEBUG_FLAGS}")
set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} -O2 ${COMPILER_FAST_MATH} ${COMPILER_DEBUG_FLAGS}")
@ -26,8 +26,8 @@ Index: cmake/Toolset.cmake
+ set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${COMPILER_FAST_MATH} -fomit-frame-pointer")
if (ENABLE_FULL_DEBUG MATCHES "ON")
if (COMPILER_GCC)
@@ -155,8 +155,8 @@ if (COMPILER_GCC)
if (ENABLE_ANALYZER MATCHES "ON")
@@ -156,8 +156,8 @@ if (COMPILER_GCC)
else ()
# Clang flags
set (COMPILER_DEBUG_FLAGS "-g -glldb -gdwarf-aranges -gdwarf-4")

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.39 2020/10/02 18:51:13 sthen Exp $
@comment $OpenBSD: PLIST,v 1.40 2021/01/09 12:50:09 sthen Exp $
@newgroup _rspamd:756
@newuser _rspamd:756:_rspamd:daemon:Rspamd Account:/nonexistent:/sbin/nologin
@rcscript ${RCDIR}/rspamd
@ -92,6 +92,8 @@ share/examples/rspamd/modules.d/hfilter.conf
@sample ${SYSCONFDIR}/rspamd/modules.d/hfilter.conf
share/examples/rspamd/modules.d/history_redis.conf
@sample ${SYSCONFDIR}/rspamd/modules.d/history_redis.conf
share/examples/rspamd/modules.d/http_headers.conf
@sample ${SYSCONFDIR}/rspamd/modules.d/http_headers.conf
share/examples/rspamd/modules.d/maillist.conf
@sample ${SYSCONFDIR}/rspamd/modules.d/maillist.conf
share/examples/rspamd/modules.d/metadata_exporter.conf
@ -308,9 +310,13 @@ share/rspamd/lualib/lua_urls_compose.lua
share/rspamd/lualib/lua_util.lua
share/rspamd/lualib/lua_verdict.lua
share/rspamd/lualib/lupa.lua
share/rspamd/lualib/plugins/
share/rspamd/lualib/plugins/neural.lua
share/rspamd/lualib/plugins/rbl.lua
share/rspamd/lualib/plugins_stats.lua
share/rspamd/lualib/rescore_utility.lua
share/rspamd/lualib/rspamadm/
share/rspamd/lualib/rspamadm/clickhouse.lua
share/rspamd/lualib/rspamadm/configgraph.lua
share/rspamd/lualib/rspamadm/confighelp.lua
share/rspamd/lualib/rspamadm/configwizard.lua
@ -347,6 +353,7 @@ share/rspamd/plugins/fuzzy_collect.lua
share/rspamd/plugins/greylist.lua
share/rspamd/plugins/hfilter.lua
share/rspamd/plugins/history_redis.lua
share/rspamd/plugins/http_headers.lua
share/rspamd/plugins/ip_score.lua
share/rspamd/plugins/maillist.lua
share/rspamd/plugins/maps_stats.lua
@ -380,11 +387,11 @@ share/rspamd/rules/content.lua
share/rspamd/rules/controller/
share/rspamd/rules/controller/init.lua
share/rspamd/rules/controller/maps.lua
share/rspamd/rules/controller/neural.lua
share/rspamd/rules/controller/selectors.lua
share/rspamd/rules/forwarding.lua
share/rspamd/rules/headers_checks.lua
share/rspamd/rules/html.lua
share/rspamd/rules/http_headers.lua
share/rspamd/rules/mid.lua
share/rspamd/rules/misc.lua
share/rspamd/rules/regexp/