pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

rspamd12: Update to 1.3.5.

Module Name:	pkgsrc-wip
Committed By:	Bartosz Kuzma <bartosz.kuzma%gmail.com@localhost>
Pushed By:	bartosz.kuzma
Date:		Tue Sep 27 15:39:47 2016 +0200
Changeset:	dca249c7f215565d70c989ad3f1ef773ecaed1eb

Modified Files:
	rspamd12/Makefile
	rspamd12/PLIST
	rspamd12/distinfo
	rspamd12/patches/patch-CMakeLists.txt
Added Files:
	rspamd12/patches/patch-src__CMakeLists.txt

Log Message:
rspamd12: Update to 1.3.5.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=dca249c7f215565d70c989ad3f1ef773ecaed1eb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 rspamd12/Makefile                          |  9 ++++++++-
 rspamd12/PLIST                             | 11 +++++++++++
 rspamd12/distinfo                          | 11 ++++++-----
 rspamd12/patches/patch-CMakeLists.txt      |  6 +++---
 rspamd12/patches/patch-src__CMakeLists.txt | 16 ++++++++++++++++
 5 files changed, 44 insertions(+), 9 deletions(-)

diffs:
diff --git a/rspamd12/Makefile b/rspamd12/Makefile
index 68954da..68e9a67 100644
--- a/rspamd12/Makefile
+++ b/rspamd12/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	rspamd-1.2.8
+DISTNAME=	rspamd-1.3.5
 CATEGORIES=	mail
 MASTER_SITES=	http://www.rspamd.com/downloads/
 EXTRACT_SUFX=	.tar.xz
@@ -10,6 +10,8 @@ HOMEPAGE=	https://www.rspamd.com/
 COMMENT=	Fast, free and open-source spam filtering system
 LICENSE=	2-clause-bsd
 
+DEPENDS+=	ragel-[0-9]*:../../devel/ragel
+
 USE_CMAKE=	yes
 USE_TOOLS+=	perl pkg-config
 USE_LANGUAGES=	c99
@@ -44,6 +46,8 @@ CMAKE_ARGS+=	-DRSPAMD_USER=${RSPAMD_USER}
 CMAKE_ARGS+=	-DRSPAMD_GROUP=${RSPAMD_GROUP}
 CMAKE_ARGS+=	-DENABLE_LUAJIT=OFF
 
+REPLACE_PERL+=	utils/rspamd_stats.pl
+
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/modules.d
 
 OWN_DIRS_PERMS+=	${DBDIR} ${RSPAMD_USER} ${RSPAMD_GROUP} 0700
@@ -57,12 +61,15 @@ CONF_FILES+=	${EGDIR}/logging.inc ${PKG_SYSCONFDIR}/logging.inc
 CONF_FILES+=	${EGDIR}/metrics.conf ${PKG_SYSCONFDIR}/metrics.conf
 CONF_FILES+=	${EGDIR}/modules.conf ${PKG_SYSCONFDIR}/modules.conf
 CONF_FILES+=	${EGDIR}/options.inc ${PKG_SYSCONFDIR}/options.inc
+CONF_FILES+=	${EGDIR}/redirectors.inc ${PKG_SYSCONFDIR}/redirectors.inc
 CONF_FILES+=	${EGDIR}/rspamd.conf ${PKG_SYSCONFDIR}/rspamd.conf
 CONF_FILES+=	${EGDIR}/statistic.conf ${PKG_SYSCONFDIR}/statistic.conf
 CONF_FILES+=	${EGDIR}/surbl-whitelist.inc \
 	${PKG_SYSCONFDIR}/surbl-whitelist.inc
 CONF_FILES+=	${EGDIR}/worker-controller.inc \
 	${PKG_SYSCONFDIR}/worker-controller.inc
+CONF_FILES+=	${EGDIR}/worker-fuzzy.inc \
+	${PKG_SYSCONFDIR}/worker-fuzzy.inc
 CONF_FILES+=	${EGDIR}/worker-normal.inc \
 	${PKG_SYSCONFDIR}/worker-normal.inc
 CONF_FILES+=	${EGDIR}/modules.d/chartable.conf \
diff --git a/rspamd12/PLIST b/rspamd12/PLIST
index dfa4247..c97bb29 100644
--- a/rspamd12/PLIST
+++ b/rspamd12/PLIST
@@ -5,6 +5,7 @@ bin/rspamc
 bin/rspamc-${PKGVERSION}
 bin/rspamd
 bin/rspamd-${PKGVERSION}
+bin/rspamd_stats
 lib/rspamd/librspamd-actrie.so
 man/man1/rspamadm.1
 man/man1/rspamc.1
@@ -38,6 +39,7 @@ share/examples/rspamd/modules.d/spf.conf
 share/examples/rspamd/modules.d/surbl.conf
 share/examples/rspamd/modules.d/whitelist.conf
 share/examples/rspamd/options.inc
+share/examples/rspamd/redirectors.inc
 share/examples/rspamd/rspamd.conf
 share/examples/rspamd/rspamd.systemd.conf
 share/examples/rspamd/rspamd.sysvinit.conf
@@ -45,14 +47,17 @@ share/examples/rspamd/spf_dkim_whitelist.inc
 share/examples/rspamd/statistic.conf
 share/examples/rspamd/surbl-whitelist.inc
 share/examples/rspamd/worker-controller.inc
+share/examples/rspamd/worker-fuzzy.inc
 share/examples/rspamd/worker-normal.inc
 share/rspamd/effective_tld_names.dat
+share/rspamd/lua/asn.lua
 share/rspamd/lua/dcc.lua
 share/rspamd/lua/dmarc.lua
 share/rspamd/lua/emails.lua
 share/rspamd/lua/fann_scores.lua
 share/rspamd/lua/forged_recipients.lua
 share/rspamd/lua/fun.lua
+share/rspamd/lua/greylist.lua
 share/rspamd/lua/hfilter.lua
 share/rspamd/lua/ip_score.lua
 share/rspamd/lua/maillist.lua
@@ -62,11 +67,13 @@ share/rspamd/lua/once_received.lua
 share/rspamd/lua/phishing.lua
 share/rspamd/lua/ratelimit.lua
 share/rspamd/lua/rbl.lua
+share/rspamd/lua/replies.lua
 share/rspamd/lua/rspamd_update.lua
 share/rspamd/lua/settings.lua
 share/rspamd/lua/spamassassin.lua
 share/rspamd/lua/trie.lua
 share/rspamd/lua/whitelist.lua
+share/rspamd/rules/forwarding.lua
 share/rspamd/rules/html.lua
 share/rspamd/rules/http_headers.lua
 share/rspamd/rules/misc.lua
@@ -74,9 +81,11 @@ share/rspamd/rules/regexp/drugs.lua
 share/rspamd/rules/regexp/fraud.lua
 share/rspamd/rules/regexp/headers.lua
 share/rspamd/rules/regexp/lotto.lua
+share/rspamd/rules/regexp/upstream_spam_filters.lua
 share/rspamd/rules/rspamd.classifiers.lua
 share/rspamd/rules/rspamd.lua
 share/rspamd/www/README.md
+share/rspamd/www/css/d3evolution.css
 share/rspamd/www/css/datatables.min.css
 share/rspamd/www/css/glyphicons-halflings-regular.woff
 share/rspamd/www/css/glyphicons-halflings-regular.woff2
@@ -87,8 +96,10 @@ share/rspamd/www/img/desc.png
 share/rspamd/www/img/spinner.gif
 share/rspamd/www/img/spinner.png
 share/rspamd/www/index.html
+share/rspamd/www/js/d3evolution.min.js
 share/rspamd/www/js/d3pie.min.js
 share/rspamd/www/js/datatables.min.js
+share/rspamd/www/js/humanize.min.js
 share/rspamd/www/js/rspamd.js
 share/rspamd/www/plugins.txt
 share/rspamd/www/react-index.html
diff --git a/rspamd12/distinfo b/rspamd12/distinfo
index d080965..b897afc 100644
--- a/rspamd12/distinfo
+++ b/rspamd12/distinfo
@@ -1,7 +1,8 @@
 $NetBSD: distinfo,v 1.7 2015/11/03 23:27:19 agc Exp $
 
-SHA1 (rspamd-1.2.8.tar.xz) = 751de94071afc5ece2fcb5b8a3fbdd5fae107ef3
-RMD160 (rspamd-1.2.8.tar.xz) = 1bde109c9a57f3bf39dd3a922e615fc28f8e1cd8
-SHA512 (rspamd-1.2.8.tar.xz) = 21ca76636ce1482233cb3631343e827678d07e0db21e8c0b3961a8124aba4260f2c4f1a4dc110c5689b02707951f28c2ee0e72d1e8cd5c49d9b73fbf688a6056
-Size (rspamd-1.2.8.tar.xz) = 1423888 bytes
-SHA1 (patch-CMakeLists.txt) = 4f91bbfec454891c0875c54515c5fe5deb292932
+SHA1 (rspamd-1.3.5.tar.xz) = 3471af33cd8a40aa85e53167f376acf59716e07e
+RMD160 (rspamd-1.3.5.tar.xz) = 9c6933cff9fd136602b40b70c3b2576f36697e59
+SHA512 (rspamd-1.3.5.tar.xz) = 6d7223c6be6e49296a5228d3d05a5f8dfd4a4002df9d247740bce75f2f652a01d86c30456b8475d08d529d2787aa30191713961ffc82c380c00612cae371b61c
+Size (rspamd-1.3.5.tar.xz) = 1483044 bytes
+SHA1 (patch-CMakeLists.txt) = 81b847220b8c8736b13209fb5bedf0020a8d7acf
+SHA1 (patch-src__CMakeLists.txt) = 418b2b3d549b8448020c445b9e94febdb8713a3f
diff --git a/rspamd12/patches/patch-CMakeLists.txt b/rspamd12/patches/patch-CMakeLists.txt
index 80ea888..e86d460 100644
--- a/rspamd12/patches/patch-CMakeLists.txt
+++ b/rspamd12/patches/patch-CMakeLists.txt
@@ -2,9 +2,9 @@ $NetBSD$
 
 For pkgsrc. Install config files to examples directory.
 
---- CMakeLists.txt.orig	2016-06-20 10:10:44.000000000 +0000
+--- CMakeLists.txt.orig	2016-09-01 11:42:54.000000000 +0000
 +++ CMakeLists.txt
-@@ -1141,9 +1141,9 @@ FILE(GLOB_RECURSE CONF_FILES RELATIVE "$
+@@ -1244,9 +1244,9 @@ FILE(GLOB_RECURSE CONF_FILES RELATIVE "$
  	"${CMAKE_CURRENT_SOURCE_DIR}/conf/*" )
  FOREACH(CONF_FILE ${CONF_FILES})
  	GET_FILENAME_COMPONENT(_rp ${CONF_FILE} PATH)
@@ -16,7 +16,7 @@ For pkgsrc. Install config files to examples directory.
  ENDFOREACH(CONF_FILE)
  
  # Main config is special due to systemd
-@@ -1153,13 +1153,13 @@ ELSE(WANT_SYSTEMD_UNITS MATCHES "ON")
+@@ -1256,13 +1256,13 @@ ELSE(WANT_SYSTEMD_UNITS MATCHES "ON")
  	SET(MAIN_CONF "conf/rspamd.sysvinit.conf")
  ENDIF(WANT_SYSTEMD_UNITS MATCHES "ON")
  IF(BUILD_PORT)
diff --git a/rspamd12/patches/patch-src__CMakeLists.txt b/rspamd12/patches/patch-src__CMakeLists.txt
new file mode 100644
index 0000000..5ea61dd
--- /dev/null
+++ b/rspamd12/patches/patch-src__CMakeLists.txt
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Add librt to link line for shm_open().
+
+--- src/CMakeLists.txt.orig	2016-08-25 12:14:57.000000000 +0000
++++ src/CMakeLists.txt
+@@ -141,6 +141,9 @@ TARGET_LINK_LIBRARIES(rspamd-server rspa
+ TARGET_LINK_LIBRARIES(rspamd-server rspamd-lpeg)
+ TARGET_LINK_LIBRARIES(rspamd-server lcbtrie)
+ 
++# for shm_open
++TARGET_LINK_LIBRARIES(rspamd-server rt)
++
+ IF (ENABLE_CLANG_PLUGIN MATCHES "ON")
+ 	ADD_DEPENDENCIES(rspamd-server rspamd-clang)
+ ENDIF()
Home | Main Index | Thread Index | Old Index