From 725909c155b3de5121839f5ae8961c54f320b27b Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 5 Oct 2021 06:10:42 -0400 Subject: [PATCH] import evolution-data-server-3.28.5-17.el8 --- ...calbackendfile-interval-tree-destroy.patch | 13 ++++++ ....28.5-cmake-variable-name-comparison.patch | 44 +++++++++++++++++++ ...data-server-3.28.5-imapx-icloud-mail.patch | 42 ++++++++++++++++++ SPECS/evolution-data-server.spec | 21 ++++++++- 4 files changed, 119 insertions(+), 1 deletion(-) create mode 100644 SOURCES/evolution-data-server-3.28.5-calbackendfile-interval-tree-destroy.patch create mode 100644 SOURCES/evolution-data-server-3.28.5-cmake-variable-name-comparison.patch create mode 100644 SOURCES/evolution-data-server-3.28.5-imapx-icloud-mail.patch diff --git a/SOURCES/evolution-data-server-3.28.5-calbackendfile-interval-tree-destroy.patch b/SOURCES/evolution-data-server-3.28.5-calbackendfile-interval-tree-destroy.patch new file mode 100644 index 0000000..5188f38 --- /dev/null +++ b/SOURCES/evolution-data-server-3.28.5-calbackendfile-interval-tree-destroy.patch @@ -0,0 +1,13 @@ +diff -up evolution-data-server-3.28.5/src/calendar/backends/file/e-cal-backend-file.c.calbackendfile-interval-tree-destroy evolution-data-server-3.28.5/src/calendar/backends/file/e-cal-backend-file.c +--- evolution-data-server-3.28.5/src/calendar/backends/file/e-cal-backend-file.c.calbackendfile-interval-tree-destroy 2021-06-16 16:09:19.863360296 +0200 ++++ evolution-data-server-3.28.5/src/calendar/backends/file/e-cal-backend-file.c 2021-06-16 16:10:14.225398710 +0200 +@@ -298,7 +298,8 @@ free_calendar_data (ECalBackendFile *cbf + + g_rec_mutex_lock (&priv->idle_save_rmutex); + +- e_intervaltree_destroy (priv->interval_tree); ++ if (priv->interval_tree) ++ e_intervaltree_destroy (priv->interval_tree); + priv->interval_tree = NULL; + + free_calendar_components (priv->comp_uid_hash, priv->icalcomp); diff --git a/SOURCES/evolution-data-server-3.28.5-cmake-variable-name-comparison.patch b/SOURCES/evolution-data-server-3.28.5-cmake-variable-name-comparison.patch new file mode 100644 index 0000000..88b9a11 --- /dev/null +++ b/SOURCES/evolution-data-server-3.28.5-cmake-variable-name-comparison.patch @@ -0,0 +1,44 @@ +diff -up evolution-data-server-3.28.5/cmake/modules/PrintableOptions.cmake.cmake-variable-name-comparison evolution-data-server-3.28.5/cmake/modules/PrintableOptions.cmake +--- evolution-data-server-3.28.5/cmake/modules/PrintableOptions.cmake.cmake-variable-name-comparison 2021-06-16 16:45:58.554763738 +0200 ++++ evolution-data-server-3.28.5/cmake/modules/PrintableOptions.cmake 2021-06-16 16:47:13.343021509 +0200 +@@ -19,32 +19,32 @@ + # prints all the build options previously added with the above functions + + macro(add_printable_variable_bare _name) +- if(_name STREQUAL "") ++ if("${_name}" STREQUAL "") + message(FATAL_ERROR "variable name cannot be empty") +- endif(_name STREQUAL "") ++ endif("${_name}" STREQUAL "") + list(APPEND _printable_options ${_name}) + endmacro() + + macro(add_printable_option _name _description _default_value) +- if(_name STREQUAL "") ++ if("${_name}" STREQUAL "") + message(FATAL_ERROR "option name cannot be empty") +- endif(_name STREQUAL "") ++ endif("${_name}" STREQUAL "") + option(${_name} ${_description} ${_default_value}) + add_printable_variable_bare(${_name}) + endmacro() + + macro(add_printable_variable _name _description _default_value) +- if(_name STREQUAL "") ++ if("${_name}" STREQUAL "") + message(FATAL_ERROR "variable name cannot be empty") +- endif(_name STREQUAL "") ++ endif("${_name}" STREQUAL "") + set(${_name} ${_default_value} CACHE STRING ${_description}) + add_printable_variable_bare(${_name}) + endmacro() + + macro(add_printable_variable_path _name _description _default_value) +- if(_name STREQUAL "") ++ if("${_name}" STREQUAL "") + message(FATAL_ERROR "path variable name cannot be empty") +- endif(_name STREQUAL "") ++ endif("${_name}" STREQUAL "") + set(${_name} ${_default_value} CACHE PATH ${_description}) + add_printable_variable_bare(${_name}) + endmacro() diff --git a/SOURCES/evolution-data-server-3.28.5-imapx-icloud-mail.patch b/SOURCES/evolution-data-server-3.28.5-imapx-icloud-mail.patch new file mode 100644 index 0000000..32694a3 --- /dev/null +++ b/SOURCES/evolution-data-server-3.28.5-imapx-icloud-mail.patch @@ -0,0 +1,42 @@ +diff -up evolution-data-server-3.28.5/src/camel/providers/imapx/camel-imapx-server.c.imapx-icloud-mail evolution-data-server-3.28.5/src/camel/providers/imapx/camel-imapx-server.c +--- evolution-data-server-3.28.5/src/camel/providers/imapx/camel-imapx-server.c.imapx-icloud-mail 2021-04-23 09:30:07.734875376 +0200 ++++ evolution-data-server-3.28.5/src/camel/providers/imapx/camel-imapx-server.c 2021-04-23 09:31:45.321718451 +0200 +@@ -629,6 +629,12 @@ imapx_server_stash_command_arguments (Ca + if (CAMEL_IMAPX_HAVE_CAPABILITY (is->priv->cinfo, SPECIAL_USE) || CAMEL_IMAPX_HAVE_CAPABILITY (is->priv->cinfo, X_GM_EXT_1)) + g_string_append_printf (buffer, " SPECIAL-USE"); + is->priv->list_return_opts = g_string_free (buffer, FALSE); ++ } else if (!is->priv->is_broken_cyrus && CAMEL_IMAPX_HAVE_CAPABILITY (is->priv->cinfo, LIST_STATUS)) { ++ buffer = g_string_new (""); ++ g_string_append_printf ( ++ buffer, "STATUS (%s)", ++ is->priv->status_data_items); ++ is->priv->list_return_opts = g_string_free (buffer, FALSE); + } else { + is->priv->list_return_opts = NULL; + } +@@ -6208,7 +6214,7 @@ camel_imapx_server_list_sync (CamelIMAPX + + camel_imapx_command_unref (ic); + +- if (success && !is->priv->list_return_opts) { ++ if (success && (!is->priv->list_return_opts || CAMEL_IMAPX_LACK_CAPABILITY (is->priv->cinfo, LIST_EXTENDED))) { + ic = camel_imapx_command_new (is, CAMEL_IMAPX_JOB_LSUB, "LSUB \"\" %s", + pattern); + +diff -up evolution-data-server-3.28.5/src/camel/providers/imapx/camel-imapx-utils.c.imapx-icloud-mail evolution-data-server-3.28.5/src/camel/providers/imapx/camel-imapx-utils.c +--- evolution-data-server-3.28.5/src/camel/providers/imapx/camel-imapx-utils.c.imapx-icloud-mail 2018-07-30 15:17:06.000000000 +0200 ++++ evolution-data-server-3.28.5/src/camel/providers/imapx/camel-imapx-utils.c 2021-04-23 09:30:07.736875373 +0200 +@@ -580,13 +580,6 @@ imapx_parse_capability (CamelIMAPXInputS + stream, &token, &len, cancellable, &local_error); + } + +- /* Some capabilities are extensions of other capabilities. +- * Make sure all prerequisite capability flags are present. */ +- +- /* LIST-STATUS is an extension of LIST-EXTENDED. */ +- if (CAMEL_IMAPX_HAVE_CAPABILITY (cinfo, LIST_STATUS)) +- cinfo->capa |= imapx_lookup_capability ("LIST-EXTENDED"); +- + if (local_error != NULL) { + g_propagate_error (error, local_error); + imapx_free_capability (cinfo); diff --git a/SPECS/evolution-data-server.spec b/SPECS/evolution-data-server.spec index 55cb1ec..b6e1ad2 100644 --- a/SPECS/evolution-data-server.spec +++ b/SPECS/evolution-data-server.spec @@ -32,7 +32,7 @@ Name: evolution-data-server Version: 3.28.5 -Release: 15%{?dist} +Release: 17%{?dist} Group: System Environment/Libraries Summary: Backend data server for Evolution License: LGPLv2+ @@ -88,6 +88,15 @@ Patch11: evolution-data-server-3.28.5-CVE-2020-14928.patch # RH bug #1862403 Patch12: evolution-data-server-3.28.5-CVE-2020-16117.patch +# RH bug #1952792 +Patch13: evolution-data-server-3.28.5-imapx-icloud-mail.patch + +# RH bug #1972749 +Patch14: evolution-data-server-3.28.5-cmake-variable-name-comparison.patch + +# RH bug #1971676 +Patch15: evolution-data-server-3.28.5-calbackendfile-interval-tree-destroy.patch + ### Dependencies ### Requires: dconf @@ -219,6 +228,9 @@ the functionality of the installed %{name} package. %patch10 -p1 -b .test-cal-meta-backend-without-evolution %patch11 -p1 -b .CVE-2020-14928 %patch12 -p1 -b .CVE-2020-16117 +%patch13 -p1 -b .imapx-icloud-mail +%patch14 -p1 -b .cmake-variable-name-comparison +%patch15 -p1 -b .calbackendfile-interval-tree-destroy %build @@ -480,6 +492,13 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_datadir}/installed-tests %changelog +* Wed Jun 16 2021 Milan Crha - 3.28.5-17 +- Resolves: #1972749 (PrintableOptions.cmake: Correct variable name comparison) +- Resolves: #1971676 (ECalBackendFile: Free interval tree only when being allocated) + +* Fri Apr 23 2021 Milan Crha - 3.28.5-16 +- Resolves: #1952792 (IMAPx: Fix connect to iCloud mail server) + * Wed Sep 30 2020 Milan Crha - 3.28.5-15 - Resolves: #1862403 (CVE-2020-16117: Crash on malformed server response with minimal capabilities)