update to rspamd-1.9.2

This commit is contained in:
sthen 2019-04-18 16:12:15 +00:00
parent 018e838702
commit a58de322a8
5 changed files with 16 additions and 12 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.66 2019/04/15 20:44:28 sthen Exp $
# $OpenBSD: Makefile,v 1.67 2019/04/18 16:12:15 sthen Exp $
COMMENT= event-driven spam filtering system in C/Lua
GH_ACCOUNT= vstakhov
GH_PROJECT= rspamd
GH_TAGNAME= 1.9.1
GH_TAGNAME= 1.9.2
CATEGORIES= mail

View File

@ -1,2 +1,2 @@
SHA256 (rspamd-1.9.1.tar.gz) = pFCSlMpWXgqGQkrmerSfKCNJtfo7/JrrFsHAPL5CKqU=
SIZE (rspamd-1.9.1.tar.gz) = 4442437
SHA256 (rspamd-1.9.2.tar.gz) = aaOcuDpNKNovwvwtx8jgdDVVflDhnP33O9Hr2WTagPk=
SIZE (rspamd-1.9.2.tar.gz) = 4461173

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-CMakeLists_txt,v 1.21 2019/03/13 14:46:10 sthen Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.22 2019/04/18 16:12:15 sthen Exp $
don't pick up libevent2 from ports, otherwise rspamd links against
both libevent from base *and* libevent2
@ -6,7 +6,7 @@ both libevent from base *and* libevent2
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -516,14 +516,14 @@ SET(POE_LOOP "Loop::IO_Poll")
@@ -517,14 +517,14 @@ SET(POE_LOOP "Loop::IO_Poll")
SET(TAR "tar")
# Platform specific configuration
@ -23,7 +23,7 @@ Index: CMakeLists.txt
# Find util library
ProcessPackage(LIBUTIL LIBRARY util INCLUDE libutil.h
ROOT ${LIBUTIL_ROOT_DIR} OPTIONAL)
@@ -539,8 +539,14 @@ IF(CMAKE_SYSTEM_NAME MATCHES "^.*BSD$|DragonFly")
@@ -540,8 +540,14 @@ IF(CMAKE_SYSTEM_NAME MATCHES "^.*BSD$|DragonFly")
ENDIF()
SET(POE_LOOP "Loop::Kqueue")
SET(TAR "gtar")
@ -39,7 +39,7 @@ Index: CMakeLists.txt
IF(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_BSD_SOURCE -DDARWIN")
SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS} -undefined dynamic_lookup")
@@ -654,7 +660,7 @@ ELSE()
@@ -655,7 +661,7 @@ ELSE()
ENDIF()
ProcessPackage(LIBEVENT LIBRARY event INCLUDE event.h INCLUDE_SUFFIXES include/event
@ -48,7 +48,7 @@ Index: CMakeLists.txt
ProcessPackage(SQLITE3 LIBRARY sqlite3 INCLUDE sqlite3.h INCLUDE_SUFFIXES include/sqlite3 include/sqlite
ROOT ${SQLITE3_ROOT_DIR} MODULES sqlite3 sqlite)
ProcessPackage(ICUDATA LIBRARY icudata INCLUDE unicode/ucnv.h
@@ -1082,9 +1088,9 @@ CHECK_C_SOURCE_COMPILES ("#include <event.h>
@@ -1083,9 +1089,9 @@ CHECK_C_SOURCE_COMPILES ("#include <event.h>
#error Unsupported
#endif
int main() { return 0;}" HAVE_LIBEVENT2)

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-src_CMakeLists_txt,v 1.9 2019/03/13 14:46:10 sthen Exp $
$OpenBSD: patch-src_CMakeLists_txt,v 1.10 2019/04/18 16:12:15 sthen Exp $
Index: src/CMakeLists.txt
--- src/CMakeLists.txt.orig
+++ src/CMakeLists.txt
@@ -215,9 +215,9 @@ IF(USE_CXX_LINKER)
@@ -216,9 +216,9 @@ IF(USE_CXX_LINKER)
SET_TARGET_PROPERTIES(rspamd PROPERTIES LINKER_LANGUAGE CXX)
SET_TARGET_PROPERTIES(rspamd-server PROPERTIES LINKER_LANGUAGE CXX)
ENDIF()

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.28 2019/04/15 20:44:28 sthen Exp $
@comment $OpenBSD: PLIST,v 1.29 2019/04/18 16:12:15 sthen Exp $
@newgroup _rspamd:756
@newuser _rspamd:756:_rspamd:daemon:Rspamd Account:/nonexistent:/sbin/nologin
!%%no_luajit%%
@ -240,6 +240,7 @@ share/rspamd/lualib/ansicolors.lua
share/rspamd/lualib/argparse.lua
share/rspamd/lualib/fun.lua
share/rspamd/lualib/global_functions.lua
share/rspamd/lualib/lpegre.lua
share/rspamd/lualib/lua_auth_results.lua
share/rspamd/lualib/lua_cfg_transform.lua
share/rspamd/lualib/lua_clickhouse.lua
@ -248,7 +249,9 @@ share/rspamd/lualib/lua_ffi/
share/rspamd/lualib/lua_ffi/common.lua
share/rspamd/lualib/lua_ffi/dkim.lua
share/rspamd/lualib/lua_ffi/init.lua
share/rspamd/lualib/lua_ffi/spf.lua
share/rspamd/lualib/lua_fuzzy.lua
share/rspamd/lualib/lua_ical.lua
share/rspamd/lualib/lua_maps.lua
share/rspamd/lualib/lua_meta.lua
share/rspamd/lualib/lua_nn.lua
@ -280,6 +283,7 @@ share/rspamd/lualib/rspamadm/confighelp.lua
share/rspamd/lualib/rspamadm/configwizard.lua
share/rspamd/lualib/rspamadm/cookie.lua
share/rspamd/lualib/rspamadm/corpus_test.lua
share/rspamd/lualib/rspamadm/dns_tool.lua
share/rspamd/lualib/rspamadm/fuzzy_convert.lua
share/rspamd/lualib/rspamadm/fuzzy_stat.lua
share/rspamd/lualib/rspamadm/grep.lua