From 8871a046aa8ceadfeda15c0bbda789bf7369e04d Mon Sep 17 00:00:00 2001 From: landry Date: Thu, 29 Jun 2017 12:00:38 +0000 Subject: [PATCH] Update to rspamd 1.6.1. rmilter support is now deprecated, see https://rspamd.com/announce/2017/06/12/rspamd-1.6.0.html. Drop gd dependency following upstream. ok sthen@ --- mail/rspamd/Makefile | 7 ++--- mail/rspamd/distinfo | 4 +-- mail/rspamd/patches/patch-CMakeLists_txt | 13 +++++---- .../patches/patch-contrib_zstd_CMakeLists_txt | 9 +++--- mail/rspamd/pkg/PLIST | 28 +++++++++++++++---- 5 files changed, 39 insertions(+), 22 deletions(-) diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile index 82a48c80388..62f6eeb8468 100644 --- a/mail/rspamd/Makefile +++ b/mail/rspamd/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.37 2017/05/28 09:35:26 jasper Exp $ +# $OpenBSD: Makefile,v 1.38 2017/06/29 12:00:38 landry Exp $ COMMENT= event-driven spam filtering system in C/Lua GH_ACCOUNT= vstakhov GH_PROJECT= rspamd -GH_TAGNAME= 1.5.8 +GH_TAGNAME= 1.6.1 CATEGORIES= mail @@ -13,7 +13,7 @@ HOMEPAGE= https://rspamd.com/ # Apache License 2.0 PERMIT_PACKAGE_CDROM= Yes -WANTLIB += c crypto event fann gd glib-2.0 gthread-2.0 icudata icui18n icuuc +WANTLIB += c crypto event fann glib-2.0 gthread-2.0 icudata icui18n icuuc WANTLIB += intl luajit-5.1 m magic pcre pthread sqlite3 ssl MODULES= devel/cmake @@ -22,7 +22,6 @@ LIB_DEPENDS= databases/sqlite3 \ devel/gettext \ devel/glib2 \ devel/pcre \ - graphics/gd \ lang/luajit \ math/fann \ textproc/icu4c diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo index 12f25815dfa..cb60834f16f 100644 --- a/mail/rspamd/distinfo +++ b/mail/rspamd/distinfo @@ -1,2 +1,2 @@ -SHA256 (rspamd-1.5.8.tar.gz) = HEFDluAt9Ss6MZFMrVGkyo+ZR69hnbciG5jJqgSQdmg= -SIZE (rspamd-1.5.8.tar.gz) = 2385290 +SHA256 (rspamd-1.6.1.tar.gz) = yZLxBjvFnJy+NttNanT7OCBJUotzEK4w552nXUYOdh4= +SIZE (rspamd-1.6.1.tar.gz) = 2462565 diff --git a/mail/rspamd/patches/patch-CMakeLists_txt b/mail/rspamd/patches/patch-CMakeLists_txt index 67874b8556d..5580b354776 100644 --- a/mail/rspamd/patches/patch-CMakeLists_txt +++ b/mail/rspamd/patches/patch-CMakeLists_txt @@ -1,11 +1,12 @@ -$OpenBSD: patch-CMakeLists_txt,v 1.10 2017/04/13 09:36:36 sthen Exp $ +$OpenBSD: patch-CMakeLists_txt,v 1.11 2017/06/29 12:00:38 landry Exp $ don't pick up libevent2 from ports, otherwise rspamd links against both libevent from base *and* libevent2 ---- CMakeLists.txt.orig Fri Apr 7 08:05:52 2017 -+++ CMakeLists.txt Wed Apr 12 19:55:03 2017 -@@ -527,14 +527,14 @@ SET(POE_LOOP "Loop::IO_Poll") +Index: CMakeLists.txt +--- CMakeLists.txt.orig ++++ CMakeLists.txt +@@ -530,14 +530,14 @@ SET(POE_LOOP "Loop::IO_Poll") SET(TAR "tar") # Platform specific configuration @@ -22,7 +23,7 @@ both libevent from base *and* libevent2 # Find util library ProcessPackage(LIBUTIL LIBRARY util INCLUDE libutil.h ROOT ${LIBUTIL_ROOT_DIR} OPTIONAL) -@@ -547,8 +547,14 @@ IF(CMAKE_SYSTEM_NAME MATCHES "^.*BSD$|DragonFly") +@@ -550,8 +550,14 @@ IF(CMAKE_SYSTEM_NAME MATCHES "^.*BSD$|DragonFly") ENDIF() SET(POE_LOOP "Loop::Kqueue") SET(TAR "gtar") @@ -38,7 +39,7 @@ both libevent from base *and* libevent2 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") -@@ -683,7 +689,7 @@ ELSE() +@@ -686,7 +692,7 @@ ELSE() ENDIF() ProcessPackage(LIBEVENT LIBRARY event INCLUDE event.h INCLUDE_SUFFIXES include/event diff --git a/mail/rspamd/patches/patch-contrib_zstd_CMakeLists_txt b/mail/rspamd/patches/patch-contrib_zstd_CMakeLists_txt index b1bc01511b6..20c66467b2c 100644 --- a/mail/rspamd/patches/patch-contrib_zstd_CMakeLists_txt +++ b/mail/rspamd/patches/patch-contrib_zstd_CMakeLists_txt @@ -1,7 +1,8 @@ -$OpenBSD: patch-contrib_zstd_CMakeLists_txt,v 1.2 2017/03/08 17:02:13 sthen Exp $ ---- contrib/zstd/CMakeLists.txt.orig Sun Dec 25 11:19:56 2016 -+++ contrib/zstd/CMakeLists.txt Sun Mar 5 15:28:06 2017 -@@ -14,7 +14,4 @@ SET(ZSTDSRC divsufsort.c +$OpenBSD: patch-contrib_zstd_CMakeLists_txt,v 1.3 2017/06/29 12:00:38 landry Exp $ +Index: contrib/zstd/CMakeLists.txt +--- contrib/zstd/CMakeLists.txt.orig ++++ contrib/zstd/CMakeLists.txt +@@ -17,7 +17,4 @@ SET(ZSTDSRC ADD_LIBRARY(rspamd-zstd STATIC ${ZSTDSRC}) IF(ENABLE_FULL_DEBUG MATCHES "OFF") diff --git a/mail/rspamd/pkg/PLIST b/mail/rspamd/pkg/PLIST index 7082b6a5063..164bae9d5c2 100644 --- a/mail/rspamd/pkg/PLIST +++ b/mail/rspamd/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.13 2017/05/17 13:30:05 sthen Exp $ +@comment $OpenBSD: PLIST,v 1.14 2017/06/29 12:00:38 landry Exp $ @newgroup _rspamd:756 @newuser _rspamd:756:_rspamd:daemon:Rspamd Account:/nonexistent:/sbin/nologin @bin bin/rspamadm @@ -36,6 +36,8 @@ share/examples/rspamd/modules.d/ @sample ${SYSCONFDIR}/rspamd/modules.d/ share/examples/rspamd/modules.d/antivirus.conf @sample ${SYSCONFDIR}/rspamd/modules.d/antivirus.conf +share/examples/rspamd/modules.d/arc.conf +@sample ${SYSCONFDIR}/rspamd/modules.d/arc.conf share/examples/rspamd/modules.d/asn.conf @sample ${SYSCONFDIR}/rspamd/modules.d/asn.conf share/examples/rspamd/modules.d/chartable.conf @@ -76,6 +78,8 @@ share/examples/rspamd/modules.d/metric_exporter.conf @sample ${SYSCONFDIR}/rspamd/modules.d/metric_exporter.conf share/examples/rspamd/modules.d/mid.conf @sample ${SYSCONFDIR}/rspamd/modules.d/mid.conf +share/examples/rspamd/modules.d/milter_headers.conf +@sample ${SYSCONFDIR}/rspamd/modules.d/milter_headers.conf share/examples/rspamd/modules.d/mime_types.conf @sample ${SYSCONFDIR}/rspamd/modules.d/mime_types.conf share/examples/rspamd/modules.d/multimap.conf @@ -96,12 +100,12 @@ share/examples/rspamd/modules.d/regexp.conf @sample ${SYSCONFDIR}/rspamd/modules.d/regexp.conf share/examples/rspamd/modules.d/replies.conf @sample ${SYSCONFDIR}/rspamd/modules.d/replies.conf -share/examples/rspamd/modules.d/rmilter_headers.conf -@sample ${SYSCONFDIR}/rspamd/modules.d/rmilter_headers.conf share/examples/rspamd/modules.d/rspamd_update.conf @sample ${SYSCONFDIR}/rspamd/modules.d/rspamd_update.conf share/examples/rspamd/modules.d/spamassassin.conf @sample ${SYSCONFDIR}/rspamd/modules.d/spamassassin.conf +share/examples/rspamd/modules.d/spamtrap.conf +@sample ${SYSCONFDIR}/rspamd/modules.d/spamtrap.conf share/examples/rspamd/modules.d/spf.conf @sample ${SYSCONFDIR}/rspamd/modules.d/spf.conf share/examples/rspamd/modules.d/surbl.conf @@ -136,11 +140,24 @@ share/examples/rspamd/worker-fuzzy.inc @sample ${SYSCONFDIR}/rspamd/worker-fuzzy.inc share/examples/rspamd/worker-normal.inc @sample ${SYSCONFDIR}/rspamd/worker-normal.inc +share/examples/rspamd/worker-proxy.inc +@sample ${SYSCONFDIR}/rspamd/worker-proxy.inc share/rspamd/ share/rspamd/effective_tld_names.dat +share/rspamd/lib/ +share/rspamd/lib/auth_results.lua +share/rspamd/lib/dkim_sign_tools.lua +share/rspamd/lib/fun.lua +share/rspamd/lib/global_functions.lua +share/rspamd/lib/lua_redis.lua +share/rspamd/lib/lua_util.lua +share/rspamd/lib/maps.lua +share/rspamd/lib/meta_functions.lua share/rspamd/lua/ share/rspamd/lua/antivirus.lua +share/rspamd/lua/arc.lua share/rspamd/lua/asn.lua +share/rspamd/lua/bayes_expiry.lua share/rspamd/lua/clickhouse.lua share/rspamd/lua/dcc.lua share/rspamd/lua/dkim_signing.lua @@ -152,7 +169,6 @@ share/rspamd/lua/fann_redis.lua share/rspamd/lua/fann_scores.lua share/rspamd/lua/force_actions.lua share/rspamd/lua/forged_recipients.lua -share/rspamd/lua/fun.lua share/rspamd/lua/fuzzy_collect.lua share/rspamd/lua/greylist.lua share/rspamd/lua/hfilter.lua @@ -162,6 +178,7 @@ share/rspamd/lua/maillist.lua share/rspamd/lua/metadata_exporter.lua share/rspamd/lua/metric_exporter.lua share/rspamd/lua/mid.lua +share/rspamd/lua/milter_headers.lua share/rspamd/lua/mime_types.lua share/rspamd/lua/multimap.lua share/rspamd/lua/mx_check.lua @@ -170,10 +187,10 @@ share/rspamd/lua/phishing.lua share/rspamd/lua/ratelimit.lua share/rspamd/lua/rbl.lua share/rspamd/lua/replies.lua -share/rspamd/lua/rmilter_headers.lua share/rspamd/lua/rspamd_update.lua share/rspamd/lua/settings.lua share/rspamd/lua/spamassassin.lua +share/rspamd/lua/spamtrap.lua share/rspamd/lua/trie.lua share/rspamd/lua/url_redirector.lua share/rspamd/lua/url_reputation.lua @@ -181,7 +198,6 @@ share/rspamd/lua/url_tags.lua share/rspamd/lua/whitelist.lua share/rspamd/rules/ share/rspamd/rules/forwarding.lua -share/rspamd/rules/global_functions.lua share/rspamd/rules/headers_checks.lua share/rspamd/rules/html.lua share/rspamd/rules/http_headers.lua