[Rework] Finally remove gmime dependency from Rspamd

7 files changed, 2 insertions, 14 deletions

diff --git a/src/controller.c b/src/controller.c
index 4380f880e..16bbaff10 100644
--- a/src/controller.c
+++ b/src/controller.c
@@ -3198,7 +3198,6 @@ start_controller_worker (struct rspamd_worker *worker)
 	event_base_loop (ctx->ev_base, 0);
 	rspamd_worker_block_signals ();
 
-	g_mime_shutdown ();
 	rspamd_stat_close ();
 	rspamd_http_router_free (ctx->http);
 	rspamd_log_close (worker->srv->logger);
diff --git a/src/libmime/mime_expressions.c b/src/libmime/mime_expressions.c
index f404cc70c..d848f797d 100644
--- a/src/libmime/mime_expressions.c
+++ b/src/libmime/mime_expressions.c
@@ -1750,9 +1750,6 @@ rspamd_content_type_check (struct rspamd_task *task,
 			}
 		}
 
-#ifndef GMIME24
-		g_object_unref (part);
-#endif
 		if (check_subtype) {
 			param_data = &ct->subtype;
 		}
diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c
index 8b7c4b6f6..566f7bc4b 100644
--- a/src/libserver/protocol.c
+++ b/src/libserver/protocol.c
@@ -27,6 +27,7 @@
 #include "cryptobox.h"
 #include "contrib/zstd/zstd.h"
 #include "lua/lua_common.h"
+#include "unix-std.h"
 #include <math.h>
 
 /* Max line size */
diff --git a/src/libserver/task.h b/src/libserver/task.h
index 7e56ded79..be94f00c2 100644
--- a/src/libserver/task.h
+++ b/src/libserver/task.h
@@ -24,8 +24,6 @@
 #include "dns.h"
 #include "re_cache.h"
 
-#include <gmime/gmime.h>
-
 enum rspamd_command {
 	CMD_CHECK,
 	CMD_SYMBOLS,
diff --git a/src/libutil/util.c b/src/libutil/util.c
index 9d87d5c9f..c33a92180 100644
--- a/src/libutil/util.c
+++ b/src/libutil/util.c
@@ -2105,11 +2105,6 @@ rspamd_init_libs (void)
 	rlim.rlim_max = rlim.rlim_cur;
 	setrlimit (RLIMIT_STACK, &rlim);
 
-#ifdef GMIME_ENABLE_RFC2047_WORKAROUNDS
-	g_mime_init (GMIME_ENABLE_RFC2047_WORKAROUNDS);
-#else
-	g_mime_init (0);
-#endif
 	ctx->libmagic = magic_open (MAGIC_MIME|MAGIC_NO_CHECK_COMPRESS|
 			MAGIC_NO_CHECK_ELF|MAGIC_NO_CHECK_TAR);
 	ctx->local_addrs = rspamd_inet_library_init ();
@@ -2291,7 +2286,6 @@ rspamd_deinit_libs (struct rspamd_external_libs_ctx *ctx)
 		}
 
 		g_free (ctx->ottery_cfg);
-		g_mime_shutdown ();
 
 #ifdef HAVE_OPENSSL
 		EVP_cleanup ();
diff --git a/src/rspamd_proxy.c b/src/rspamd_proxy.c
index 9f81bcc99..a6ca0b972 100644
--- a/src/rspamd_proxy.c
+++ b/src/rspamd_proxy.c
@@ -1493,7 +1493,6 @@ start_rspamd_proxy (struct rspamd_worker *worker)
 	event_base_loop (ctx->ev_base, 0);
 	rspamd_worker_block_signals ();
 
-	g_mime_shutdown ();
 	rspamd_log_close (worker->srv->logger);
 
 	if (ctx->key) {
diff --git a/src/worker.c b/src/worker.c
index df772feb5..7b0373c9e 100644
--- a/src/worker.c
+++ b/src/worker.c
@@ -36,6 +36,7 @@
 #include "utlist.h"
 #include "libutil/http_private.h"
 #include "monitored.h"
+#include "unix-std.h"
 
 #include "lua/lua_common.h"
 
@@ -633,7 +634,6 @@ start_worker (struct rspamd_worker *worker)
 	event_base_loop (ctx->ev_base, 0);
 	rspamd_worker_block_signals ();
 
-	g_mime_shutdown ();
 	rspamd_stat_close ();
 	rspamd_log_close (worker->srv->logger);