Fix static build.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 702775fe79c4d2d83d0446520eff904c5ec36fa6..b074d8c182de007b4fd6b6b94edea3fa649274da 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -839,7 +839,6 @@ ELSE(GMIME24)
 ENDIF(GMIME24)
 IF(ENABLE_STATIC MATCHES "ON")
        TARGET_LINK_LIBRARIES(rspamd ${PCRE_LIBRARIES})
-       TARGET_LINK_LIBRARIES(rspamd ffi)
 ENDIF(ENABLE_STATIC MATCHES "ON")
 
 IF(ENABLE_LUAJIT MATCHES "ON")

diff --git a/src/cfg_file.h b/src/cfg_file.h
index 184a1aa16727a836653c86fc92e94e3c770e55dd..797f32837551b75c2d1e416fb3714b27cf07ff3f 100644 (file)
--- a/src/cfg_file.h
+++ b/src/cfg_file.h
@@ -386,7 +386,7 @@ gsize parse_limit (const gchar *limit, guint len);
  * @param default_type dimension of time if no suffix is specified
  * @return value of time in milliseconds
  */
-guint parse_time (const gchar *t, enum time_type default_type);
+guint cfg_parse_time (const gchar *t, enum time_type default_type);
 
 /**
  * Parse flag

diff --git a/src/cfg_utils.c b/src/cfg_utils.c
index 48e95cf59e6ae308bb460d548cd1bd363987c65d..f4c708b83584b96411569247ba04b8f20d79369b 100644 (file)
--- a/src/cfg_utils.c
+++ b/src/cfg_utils.c
@@ -304,7 +304,7 @@ parse_limit (const gchar *limit, guint len)
 }
 
 guint
-parse_time (const gchar *t, enum time_type default_type)
+cfg_parse_time (const gchar *t, enum time_type default_type)
 {
        union {
                guint                       i;

diff --git a/src/cfg_xml.c b/src/cfg_xml.c
index ef47ec0bf0524d88d971c79a5b22a377f9f57a0f..3709b496a847c4f0d6fdb3bd0b74def368d0b282 100644 (file)
--- a/src/cfg_xml.c
+++ b/src/cfg_xml.c
@@ -1441,7 +1441,7 @@ handle_statfile_binlog_rotate (struct config_file *cfg, struct rspamd_xml_userda
        if (st->binlog == NULL) {
                st->binlog = memory_pool_alloc0 (cfg->cfg_pool, sizeof (struct statfile_binlog_params));
        }
-       st->binlog->rotate_time = parse_time (data, TIME_SECONDS);
+       st->binlog->rotate_time = cfg_parse_time (data, TIME_SECONDS);
        
        return TRUE;
 }
@@ -1537,7 +1537,7 @@ xml_handle_seconds (struct config_file *cfg, struct rspamd_xml_userdata *ctx, GH
        guint32                      *dest;
 
        dest = (guint32 *)G_STRUCT_MEMBER_P (dest_struct, offset);
-       *dest = parse_time (data, TIME_SECONDS);
+       *dest = cfg_parse_time (data, TIME_SECONDS);
        
        return TRUE;
 }
@@ -2153,7 +2153,7 @@ check_module_option (const gchar *mname, const gchar *optname, const gchar *data
                }
                break;
        case MODULE_OPT_TYPE_TIME:
-               (void)parse_time (data, TIME_SECONDS);
+               (void)cfg_parse_time (data, TIME_SECONDS);
                if (errno != 0) {
                        msg_warn ("non-numeric data for option: '%s' for module: '%s': %s", optname, mname, strerror (errno));
                        return FALSE;

diff --git a/src/greylist_storage.c b/src/greylist_storage.c
index ec26ae27eab2e595819f357c590059c342a5c683..42e94320b40d9021522dbf38a8069ae028e8ade5 100644 (file)
--- a/src/greylist_storage.c
+++ b/src/greylist_storage.c
@@ -302,10 +302,10 @@ config_greylist_worker (struct rspamd_worker *worker)
        ctx->expire_time = DEFAULT_EXPIRE_TIME;
 
        if ((value = g_hash_table_lookup (worker->cf->params, "greylist_time")) != NULL) {
-               ctx->greylist_time = parse_time (value, TIME_SECONDS) / 1000;
+               ctx->greylist_time = cfg_parse_time (value, TIME_SECONDS) / 1000;
        }
        if ((value = g_hash_table_lookup (worker->cf->params, "expire_time")) != NULL) {
-               ctx->expire_time = parse_time (value, TIME_SECONDS) / 1000;
+               ctx->expire_time = cfg_parse_time (value, TIME_SECONDS) / 1000;
        }
        worker->ctx = ctx;
 

diff --git a/src/plugins/fuzzy_check.c b/src/plugins/fuzzy_check.c
index 622d169fa011f82e3808095ebff2628dbcfb27d6..f330e7ecdaf853b8b7bf454ce9b17cc326d6829b 100644 (file)
--- a/src/plugins/fuzzy_check.c
+++ b/src/plugins/fuzzy_check.c
@@ -395,7 +395,7 @@ fuzzy_check_module_config (struct config_file *cfg)
                fuzzy_module_ctx->min_width = 0;
        }
        if ((value = get_module_opt (cfg, "fuzzy_check", "timeout")) != NULL) {
-               fuzzy_module_ctx->io_timeout = parse_time (value, TIME_SECONDS);
+               fuzzy_module_ctx->io_timeout = cfg_parse_time (value, TIME_SECONDS);
        }
        else {
                fuzzy_module_ctx->io_timeout = DEFAULT_IO_TIMEOUT;

diff --git a/src/plugins/spf.c b/src/plugins/spf.c
index 4372f94b946f785f33967a82eb35c7dc89ca8291..e9b1531ac3de61b3bcef545b52207f3056354d5d 100644 (file)
--- a/src/plugins/spf.c
+++ b/src/plugins/spf.c
@@ -120,7 +120,7 @@ spf_module_config (struct config_file *cfg)
                cache_size = DEFAULT_CACHE_SIZE;
        }
        if ((value = get_module_opt (cfg, "spf", "spf_cache_expire")) != NULL) {
-               cache_expire = parse_time (value, TIME_SECONDS) / 1000;
+               cache_expire = cfg_parse_time (value, TIME_SECONDS) / 1000;
        }
        else {
                cache_expire = DEFAULT_CACHE_MAXAGE;

diff --git a/src/plugins/surbl.c b/src/plugins/surbl.c
index 3c4a0e53fcfffa068112be7238fcaf4d11f96d37..b848d2a30d8102bb6d8f6050424e2d25bce96d33 100644 (file)
--- a/src/plugins/surbl.c
+++ b/src/plugins/surbl.c
@@ -333,19 +333,19 @@ surbl_module_config (struct config_file *cfg)
                surbl_module_ctx->weight = DEFAULT_SURBL_WEIGHT;
        }
        if ((value = get_module_opt (cfg, "surbl", "url_expire")) != NULL) {
-               surbl_module_ctx->url_expire = parse_time (value, TIME_SECONDS) / 1000;
+               surbl_module_ctx->url_expire = cfg_parse_time (value, TIME_SECONDS) / 1000;
        }
        else {
                surbl_module_ctx->url_expire = DEFAULT_SURBL_URL_EXPIRE;
        }
        if ((value = get_module_opt (cfg, "surbl", "redirector_connect_timeout")) != NULL) {
-               surbl_module_ctx->connect_timeout = parse_time (value, TIME_SECONDS);
+               surbl_module_ctx->connect_timeout = cfg_parse_time (value, TIME_SECONDS);
        }
        else {
                surbl_module_ctx->connect_timeout = DEFAULT_REDIRECTOR_CONNECT_TIMEOUT;
        }
        if ((value = get_module_opt (cfg, "surbl", "redirector_read_timeout")) != NULL) {
-               surbl_module_ctx->read_timeout = parse_time (value, TIME_SECONDS);
+               surbl_module_ctx->read_timeout = cfg_parse_time (value, TIME_SECONDS);
        }
        else {
                surbl_module_ctx->read_timeout = DEFAULT_REDIRECTOR_READ_TIMEOUT;