Add patch for Red Hat bug #916890 (memory leaks during message send)

.gitignore

@@ -1 +1,50 @@
-/evolution-*.tar.xz
+evolution-2.31.5.tar.bz2
+/evolution-2.31.91.tar.bz2
+/evolution-2.31.92.tar.bz2
+/evolution-2.91.0.tar.bz2
+/evolution-2.91.1.tar.bz2
+/evolution-2.91.2.tar.bz2
+/evolution-2.91.3.tar.bz2
+/evolution-2.91.4.tar.bz2
+/evolution-2.91.5.tar.bz2
+/evolution-2.91.6.tar.bz2
+/evolution-2.91.6.1.tar.bz2
+/evolution-2.91.6.2.tar.bz2
+/evolution-2.91.90.tar.bz2
+/evolution-2.91.91.tar.bz2
+/evolution-2.91.92.tar.bz2
+/evolution-3.0.0.tar.bz2
+/evolution-3.1.1.tar.bz2
+/evolution-3.1.2.tar.bz2
+/evolution-3.1.3.tar.bz2
+/evolution-3.1.4.tar.bz2
+/evolution-3.1.5.tar.bz2
+/evolution-3.1.90.tar.xz
+/evolution-3.1.91.tar.xz
+/evolution-3.1.92.tar.xz
+/evolution-3.2.0.tar.xz
+/evolution-3.3.1.tar.xz
+/evolution-3.3.2.tar.xz
+/evolution-3.3.3.tar.xz
+/evolution-3.3.4.tar.xz
+/evolution-3.3.5.tar.xz
+/evolution-3.3.90.tar.xz
+/evolution-3.3.91.tar.xz
+/evolution-3.3.92.tar.xz
+/evolution-3.4.0.tar.xz
+/evolution-3.4.0.1.tar.xz
+/evolution-3.4.1.tar.xz
+/evolution-3.5.1.tar.xz
+/evolution-3.5.2.tar.xz
+/evolution-3.5.3.tar.xz
+/evolution-3.5.3.1.tar.xz
+/evolution-3.5.4.tar.xz
+/evolution-3.5.5.tar.xz
+/evolution-3.5.90.tar.xz
+/evolution-3.5.91.tar.xz
+/evolution-3.5.92.tar.xz
+/evolution-3.6.0.tar.xz
+/evolution-3.6.1.tar.xz
+/evolution-3.6.2.tar.xz
+/evolution-3.6.3.tar.xz
+/evolution-3.6.4.tar.xz

configurable-dbus-prefix.patch

@@ -1,42 +0,0 @@
-diff -up evolution-3.48.1 evolution-3.48
-diff -up evolution-3.48.1/docs/evolution.1 evolution-3.48.1/docs/evolution
-diff -up evolution-3.48.1/src/modules/backup-restore/evolution-backup-tool.c.1 evolution-3.48.1/src/modules/backup-restore/evolution-backup-tool.c
---- evolution-3.48.1/src/modules/backup-restore/evolution-backup-tool.c.1	2023-11-27 13:12:25.099463743 -0500
-+++ evolution-3.48.1/src/modules/backup-restore/evolution-backup-tool.c	2023-11-27 13:14:38.640243434 -0500
-@@ -674,7 +674,7 @@ get_source_manager_reload_command (void)
- 			g_string_free (tmp, TRUE);
- 			tmp = NULL;
- 
--			base_filename = g_strdup (EDS_SOURCES_DBUS_SERVICE_NAME);
-+			base_filename = g_ascii_strdown (EDS_SOURCES_DBUS_SERVICE_NAME, -1);
- 
- 			if (!base_filename || !*base_filename) {
- 				g_free (base_filename);
-@@ -690,14 +690,16 @@ get_source_manager_reload_command (void)
- 
- 			while (!tmp) {
- 				const gchar *name;
-+				gchar *name_down;
- 
- 				name = g_dir_read_name (dir);
-+				name_down = g_ascii_strdown (name, -1);
- 
- 				if (!name)
- 					break;
- 
--				if (g_ascii_strncasecmp (name, base_filename, base_filename_len) == 0 &&
--				    g_ascii_strncasecmp (name + strlen (name) - 8, ".service", 8) == 0) {
-+				if (strstr (name_down, base_filename) != NULL &&
-+				    strncmp (name_down + strlen (name) - 8, ".service", 8) == 0) {
- 					gchar *filename;
- 
- 					filename = g_strconcat ("$DBUSDATADIR", G_DIR_SEPARATOR_S, name, NULL);
-@@ -724,6 +726,8 @@ get_source_manager_reload_command (void)
- 						g_free (str);
- 					}
- 				}
-+
-+				g_free (name_down);
- 			}
- 
- 			g_free (base_filename);

evolution-1.4.4-ldap-x86_64-hack.patch

@@ -0,0 +1,21 @@
+diff -up evolution-2.31.1/configure.ldaphack evolution-2.31.1/configure
+--- evolution-2.31.1/configure.ldaphack	2010-05-03 12:43:34.000000000 +0200
++++ evolution-2.31.1/configure	2010-05-03 19:22:55.000000000 +0200
+@@ -15797,7 +15797,7 @@ if test "${ac_cv_lib_ldap_ldap_open+set}
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lldap $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
++LIBS="-lldap -lresolv $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -16129,7 +16129,7 @@ if test "${ac_cv_lib_ldap_ldap_open+set}
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lldap $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
++LIBS="-lldap -lresolv $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 

evolution-2.30.1-help-contents.patch

@@ -0,0 +1,19 @@
+diff -up evolution-2.30.1.2/shell/e-shell-window-actions.c.help-contents evolution-2.30.1.2/shell/e-shell-window-actions.c
+--- evolution-2.30.1.2/shell/e-shell-window-actions.c.help-contents	2010-04-26 09:13:18.000000000 -0400
++++ evolution-2.30.1.2/shell/e-shell-window-actions.c	2010-05-07 21:29:06.269059830 -0400
+@@ -2001,6 +2001,15 @@ e_shell_window_actions_init (EShellWindo
+ 	if (path == NULL)
+ 		gtk_action_set_visible (ACTION (SUBMIT_BUG), FALSE);
+ 	g_free (path);
++
++	/* Viewing user documentation requires the evolution-help
++	 * Fedora package.  Look for one of the files it installs. */
++	path = g_build_filename (
++		EVOLUTION_DATADIR, "help", "C",
++		PACKAGE, "index.page", NULL);
++	if (!g_file_test (path, G_FILE_TEST_IS_REGULAR))
++		gtk_action_set_visible (ACTION (CONTENTS), FALSE);
++	g_free (path);
+ }
+ 
+ static GList *

evolution-3.6.4-restore-dconf.patch

@@ -0,0 +1,92 @@
+diff --git a/modules/backup-restore/evolution-backup-tool.c b/modules/backup-restore/evolution-backup-tool.c
+index 7c8fc72..10522c5 100644
+--- a/modules/backup-restore/evolution-backup-tool.c
++++ b/modules/backup-restore/evolution-backup-tool.c
+@@ -156,7 +156,8 @@ strip_home_dir (const gchar *dir)
+ }
+ 
+ static GString *
+-replace_variables (const gchar *str)
++replace_variables (const gchar *str,
++		   gboolean remove_dir_sep)
+ {
+ 	GString *res = NULL, *use;
+ 	const gchar *strip_datadir, *strip_configdir;
+@@ -185,9 +186,11 @@ replace_variables (const gchar *str)
+ 
+ 	g_return_val_if_fail (res != NULL, NULL);
+ 
+-	/* remove trailing dir separator */
+-	while (res->len > 0 && res->str[res->len - 1] == G_DIR_SEPARATOR) {
+-		g_string_truncate (res, res->len - 1);
++	if (remove_dir_sep) {
++		/* remove trailing dir separator */
++		while (res->len > 0 && res->str[res->len - 1] == G_DIR_SEPARATOR) {
++			g_string_truncate (res, res->len - 1);
++		}
+ 	}
+ 
+ 	return res;
+@@ -208,7 +211,7 @@ replace_in_file (const gchar *filename,
+ 	g_return_if_fail (replace != NULL);
+ 
+ 	if (strstr (filename, "$")) {
+-		filenamestr = replace_variables (filename);
++		filenamestr = replace_variables (filename, TRUE);
+ 
+ 		if (!filenamestr) {
+ 			g_warning (
+@@ -258,7 +261,7 @@ run_cmd (const gchar *cmd)
+ 
+ 	if (strstr (cmd, "$") != NULL) {
+ 		/* read the doc for g_get_home_dir to know why replacing it here */
+-		GString *str = replace_variables (cmd);
++		GString *str = replace_variables (cmd, FALSE);
+ 
+ 		if (str) {
+ 			print_and_run (str->str);
+@@ -280,14 +283,15 @@ write_dir_file (void)
+ 	GString *content, *filename;
+ 	GError *error = NULL;
+ 
+-	filename = replace_variables ("$HOME/" EVOLUTION_DIR_FILE);
++	filename = replace_variables ("$HOME/" EVOLUTION_DIR_FILE, TRUE);
+ 	g_return_if_fail (filename != NULL);
+ 
+ 	content = replace_variables (
+ 		"[" KEY_FILE_GROUP "]\n"
+ 		"Version=" VERSION "\n"
+ 		"UserDataDir=$STRIPDATADIR\n"
+-		"UserConfigDir=$STRIPCONFIGDIR\n");
++		"UserConfigDir=$STRIPCONFIGDIR\n"
++		, TRUE);
+ 	g_return_if_fail (content != NULL);
+ 
+ 	g_file_set_contents (filename->str, content->str, content->len, &error);
+@@ -453,7 +457,7 @@ get_source_manager_reload_command (void)
+ 	GString *tmp;
+ 	gchar *command;
+ 
+-	tmp = replace_variables (DBUS_SOURCE_REGISTRY_SERVICE_FILE);
++	tmp = replace_variables (DBUS_SOURCE_REGISTRY_SERVICE_FILE, TRUE);
+ 	if (tmp) {
+ 		GKeyFile *key_file;
+ 		gchar *str = NULL;
+@@ -535,7 +539,7 @@ restore (const gchar *filename,
+ 		run_cmd (command);
+ 		g_free (command);
+ 
+-		dir_fn = replace_variables ("$TMP" G_DIR_SEPARATOR_S EVOLUTION_DIR_FILE);
++		dir_fn = replace_variables ("$TMP" G_DIR_SEPARATOR_S EVOLUTION_DIR_FILE, TRUE);
+ 		if (!dir_fn) {
+ 			g_warning ("Failed to create evolution's dir filename");
+ 			goto end;
+@@ -607,7 +611,7 @@ restore (const gchar *filename,
+ 
+ 	if (is_new_format) {
+ 		/* new format has it in DATADIR... */
+-		GString *file = replace_variables (EVOLUTION_DIR ANCIENT_GCONF_DUMP_FILE);
++		GString *file = replace_variables (EVOLUTION_DIR ANCIENT_GCONF_DUMP_FILE, TRUE);
+ 		if (file && g_file_test (file->str, G_FILE_TEST_EXISTS)) {
+ 			/* ancient backup */
+ 			replace_in_file (

evolution-3.6.4-send-message-leak.patch

@@ -0,0 +1,12 @@
+diff --git a/libemail-engine/e-mail-session-utils.c b/libemail-engine/e-mail-session-utils.c
+index 86c2545..c9100ff 100644
+--- a/libemail-engine/e-mail-session-utils.c
++++ b/libemail-engine/e-mail-session-utils.c
+@@ -933,7 +933,6 @@ e_mail_session_send_to (EMailSession *session,
+ 	context->io_priority = io_priority;
+ 	context->from = from;
+ 	context->recipients = recipients;
+-	context->message = g_object_ref (message);
+ 	context->info = info;
+ 	context->xev = xev;
+ 	context->post_to_uris = post_to_uris;

flatpak-evolution-fix-service-names.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# see https://gitlab.gnome.org/GNOME/glib/issues/1737
-# previous versions used milliseconds instead of seconds as the timeout argument",
-(`pkg-config --atleast-version 2.60.1 gio-2.0` || `pkg-config --atleast-version 2.61.0 gio-2.0`) && TIMEOUTMULT= || TIMEOUTMULT=000
-
-sed -e "s|\@SOURCES_SERVICE\@|$(pkg-config --variable=sourcesdbusservicename evolution-data-server-1.2)|" \
-    -e "s|\@ADDRESSBOOK_SERVICE\@|$(pkg-config --variable=addressbookdbusservicename evolution-data-server-1.2)|" \
-    -e "s|\@CALENDAR_SERVICE\@|$(pkg-config --variable=calendardbusservicename evolution-data-server-1.2)|" \
-    -e "s|\@TIMEOUTMULT\@|${TIMEOUTMULT}|"

flatpak-evolution-wrapper.sh.in

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-if [ "$1" = "--quit" -o "$1" = "--force-shutdown" ]; then
-   /app/bin/evolution.bin "$@"
-else
-   export BOGOFILTER_DIR="${XDG_DATA_HOME}/bogofilter/"
-   export GIO_USE_NETWORK_MONITOR=base
-   gsettings reset org.gnome.evolution-data-server network-monitor-gio-name
-
-   LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @SOURCES_SERVICE@ | wc -l)
-   if [ "${LINES}" = "0" ]; then
-      /app/libexec/evolution-source-registry &
-      gdbus wait --session --timeout=1@TIMEOUTMULT@ @SOURCES_SERVICE@
-   fi
-
-   LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @ADDRESSBOOK_SERVICE@ | wc -l)
-   if [ "${LINES}" = "0" ]; then
-      /app/libexec/evolution-addressbook-factory -r &
-      gdbus wait --session --timeout=1@TIMEOUTMULT@ @ADDRESSBOOK_SERVICE@
-   fi
-
-   LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @CALENDAR_SERVICE@ | wc -l)
-   if [ "${LINES}" = "0" ]; then
-      /app/libexec/evolution-calendar-factory -r &
-      gdbus wait --session --timeout=1@TIMEOUTMULT@ @CALENDAR_SERVICE@
-   fi
-
-   /app/bin/evolution.bin "$@"
-fi

rpminspect.yaml

@@ -1,5 +0,0 @@
----
-runpath:
-    allowed_paths:
-        - /usr/lib/evolution
-        - /usr/lib64/evolution

sources

@@ -1 +1 @@
-SHA512 (evolution-3.59.1.tar.xz) = 26d6d4dfcdbc3d89f88d9e24096c7ff910d221119def75d7f80a397f682be96860726832c7c62b46769ce9cfcc15e5844cbcc016facc9b21b4eb9bbb2c17360d
+699c29a0179df3866ecc2f972bc626a4  evolution-3.6.4.tar.xz