summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2016-02-07 23:55:29 +0000
committerVsevolod Stakhov <vsevolod@highsecure.ru>2016-02-07 23:55:29 +0000
commit048ec99a0e9cf9857a2ccf304ae1f0f4a818b48b (patch)
tree7e4631f3449b38a4bae89d77d13093e2285d6e35
parent47c0129f1d48c838af5618cc179296a1730643bf (diff)
parent9bb55177de3d289e0d03e1db1993735f197e3af9 (diff)
downloadrspamd-048ec99a0e9cf9857a2ccf304ae1f0f4a818b48b.tar.gz
rspamd-048ec99a0e9cf9857a2ccf304ae1f0f4a818b48b.zip
Merge pull request #517 from fatalbanana/master
RPM fixes
-rw-r--r--centos/rspamd.spec5
-rw-r--r--src/plugins/lua/dmarc.lua1
-rw-r--r--src/plugins/lua/rbl.lua1
-rw-r--r--src/plugins/lua/whitelist.lua1
4 files changed, 3 insertions, 5 deletions
diff --git a/centos/rspamd.spec b/centos/rspamd.spec
index 3c42d9270..7e6f4b758 100644
--- a/centos/rspamd.spec
+++ b/centos/rspamd.spec
@@ -22,8 +22,8 @@ License: BSD2c
%endif
URL: https://rspamd.com
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
-BuildRequires: glib2-devel,libevent-devel,openssl-devel,pcre-devel,perl
-BuildRequires: cmake,gmime,file-devel
+BuildRequires: glib2-devel,libevent-devel,openssl-devel,pcre-devel
+BuildRequires: cmake,gmime,file-devel,perl-Digest-MD5
%if 0%{?suse_version} || 0%{?el7} || 0%{?fedora}
BuildRequires: systemd
Requires(pre): systemd
@@ -192,6 +192,7 @@ fi
%config(noreplace) %{rspamd_confdir}/%{name}.sysvinit.conf
%config(noreplace) %{rspamd_confdir}/composites.conf
%config(noreplace) %{rspamd_confdir}/metrics.conf
+%config(noreplace) %{rspamd_confdir}/mime_types.inc
%config(noreplace) %{rspamd_confdir}/modules.conf
%config(noreplace) %{rspamd_confdir}/statistic.conf
%config(noreplace) %{rspamd_confdir}/common.conf
diff --git a/src/plugins/lua/dmarc.lua b/src/plugins/lua/dmarc.lua
index 6a75d1cca..91946f039 100644
--- a/src/plugins/lua/dmarc.lua
+++ b/src/plugins/lua/dmarc.lua
@@ -20,7 +20,6 @@ limitations under the License.
local rspamd_regexp = require "rspamd_regexp"
local rspamd_logger = require "rspamd_logger"
local rspamd_redis = require "rspamd_redis"
-local rspamd_url = require "rspamd_url"
local upstream_list = require "rspamd_upstream_list"
local rspamd_util = require "rspamd_util"
diff --git a/src/plugins/lua/rbl.lua b/src/plugins/lua/rbl.lua
index c318d5725..45880d5a3 100644
--- a/src/plugins/lua/rbl.lua
+++ b/src/plugins/lua/rbl.lua
@@ -24,7 +24,6 @@ local local_exclusions = nil
local rspamd_logger = require 'rspamd_logger'
local rspamd_ip = require 'rspamd_ip'
-local rspamd_url = require 'rspamd_url'
local rspamd_util = require 'rspamd_util'
local symbols = {
diff --git a/src/plugins/lua/whitelist.lua b/src/plugins/lua/whitelist.lua
index 53a7cd5cd..3b2b5b25d 100644
--- a/src/plugins/lua/whitelist.lua
+++ b/src/plugins/lua/whitelist.lua
@@ -15,7 +15,6 @@ limitations under the License.
]]--
local rspamd_logger = require "rspamd_logger"
-local rspamd_url = require "rspamd_url"
local rspamd_util = require "rspamd_util"
local ucl = require "ucl"
require "fun" ()