From 3cf4021900ea0f7b14f8b98efbc9a662c85ad2dc Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Fri, 5 Aug 2016 10:20:22 +0000 Subject: mail/rspamd: - Fix conflicts - Fix openssl usage - Fix rspamd.newsyslog.conf installation path - Fix formatting mail/rspamd-devel: - Update to a569362 - Fix LICENSE - Fix openssl usage - Fix fuzzy sample config install path - Fix formatting PR: 211584 Submitted by: Alexander Moisseev --- mail/rspamd-devel/files/patch-CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'mail/rspamd-devel/files/patch-CMakeLists.txt') diff --git a/mail/rspamd-devel/files/patch-CMakeLists.txt b/mail/rspamd-devel/files/patch-CMakeLists.txt index bfa3fd53841c..43852babe384 100644 --- a/mail/rspamd-devel/files/patch-CMakeLists.txt +++ b/mail/rspamd-devel/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2016-01-28 17:45:10.000000000 +0000 -+++ CMakeLists.txt 2016-01-28 23:41:09.681819000 +0000 -@@ -1090,6 +1090,20 @@ +--- CMakeLists.txt.orig 2016-07-03 20:55:47 UTC ++++ CMakeLists.txt +@@ -1223,6 +1223,21 @@ ELSE(WANT_SYSTEMD_UNITS MATCHES "ON") ENDIF(WANT_SYSTEMD_UNITS MATCHES "ON") IF(BUILD_PORT) INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${CONFDIR} "rspamd.conf" ".sample") @@ -8,6 +8,7 @@ + INSTALL_IF_NOT_EXISTS("conf/logging.inc" ${CONFDIR} "logging.inc" ".sample") + INSTALL_IF_NOT_EXISTS("conf/options.inc" ${CONFDIR} "options.inc" ".sample") + INSTALL_IF_NOT_EXISTS("conf/worker-controller.inc" ${CONFDIR} "worker-controller.inc" ".sample") ++ INSTALL_IF_NOT_EXISTS("conf/worker-fuzzy.inc" ${CONFDIR} "worker-fuzzy.inc" ".sample") + INSTALL_IF_NOT_EXISTS("conf/worker-normal.inc" ${CONFDIR} "worker-normal.inc" ".sample") + INSTALL_IF_NOT_EXISTS("conf/2tld.inc" ${CONFDIR} "2tld.inc" ".sample") + INSTALL_IF_NOT_EXISTS("conf/mime_types.inc" ${CONFDIR} "mime_types.inc" ".sample") -- cgit v1.2.3