From 85a90863f455e45989f1e5d4ec9f0ae1b530f26d Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 10 May 2022 03:00:22 -0400 Subject: [PATCH] import evolution-data-server-3.28.5-19.el8 --- ...3.28.5-nonstandard-uuencode-encoding.patch | 26 +++++++++++++++++++ ...erver-3.28.5-secret-monitor-warnings.patch | 21 +++++++++++++++ SPECS/evolution-data-server.spec | 16 +++++++++++- 3 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 SOURCES/evolution-data-server-3.28.5-nonstandard-uuencode-encoding.patch create mode 100644 SOURCES/evolution-data-server-3.28.5-secret-monitor-warnings.patch diff --git a/SOURCES/evolution-data-server-3.28.5-nonstandard-uuencode-encoding.patch b/SOURCES/evolution-data-server-3.28.5-nonstandard-uuencode-encoding.patch new file mode 100644 index 0000000..53420b6 --- /dev/null +++ b/SOURCES/evolution-data-server-3.28.5-nonstandard-uuencode-encoding.patch @@ -0,0 +1,26 @@ +diff -up evolution-data-server-3.28.5/src/camel/camel-folder-summary.c.nonstandard-uuencode-encoding evolution-data-server-3.28.5/src/camel/camel-folder-summary.c +--- evolution-data-server-3.28.5/src/camel/camel-folder-summary.c.nonstandard-uuencode-encoding 2018-07-30 15:17:06.000000000 +0200 ++++ evolution-data-server-3.28.5/src/camel/camel-folder-summary.c 2021-09-30 17:30:47.674951472 +0200 +@@ -3153,7 +3153,8 @@ summary_traverse_content_with_parser (Ca + else + camel_mime_filter_reset (summary->priv->filter_qp); + enc_id = camel_mime_parser_filter_add (mp, summary->priv->filter_qp); +- } else if (!g_ascii_strcasecmp (encoding, "x-uuencode")) { ++ } else if (!g_ascii_strcasecmp (encoding, "x-uuencode") || ++ !g_ascii_strcasecmp (encoding, "uuencode")) { + d (printf (" decoding x-uuencode\n")); + if (summary->priv->filter_uu == NULL) + summary->priv->filter_uu = camel_mime_filter_basic_new (CAMEL_MIME_FILTER_BASIC_UU_DEC); +diff -up evolution-data-server-3.28.5/src/camel/camel-mime-utils.c.nonstandard-uuencode-encoding evolution-data-server-3.28.5/src/camel/camel-mime-utils.c +--- evolution-data-server-3.28.5/src/camel/camel-mime-utils.c.nonstandard-uuencode-encoding 2018-07-30 15:17:06.000000000 +0200 ++++ evolution-data-server-3.28.5/src/camel/camel-mime-utils.c 2021-09-30 17:30:47.674951472 +0200 +@@ -3268,6 +3268,9 @@ camel_transfer_encoding_from_string (con + for (i = 0; i < G_N_ELEMENTS (encodings); i++) + if (!g_ascii_strcasecmp (string, encodings[i])) + return i; ++ ++ if (!g_ascii_strcasecmp (string, "uuencode")) ++ return CAMEL_TRANSFER_ENCODING_UUENCODE; + } + + return CAMEL_TRANSFER_ENCODING_DEFAULT; diff --git a/SOURCES/evolution-data-server-3.28.5-secret-monitor-warnings.patch b/SOURCES/evolution-data-server-3.28.5-secret-monitor-warnings.patch new file mode 100644 index 0000000..4c4b91e --- /dev/null +++ b/SOURCES/evolution-data-server-3.28.5-secret-monitor-warnings.patch @@ -0,0 +1,21 @@ +diff -up evolution-data-server-3.28.5/src/modules/secret-monitor/module-secret-monitor.c.secret-monitor-warnings evolution-data-server-3.28.5/src/modules/secret-monitor/module-secret-monitor.c +--- evolution-data-server-3.28.5/src/modules/secret-monitor/module-secret-monitor.c.secret-monitor-warnings 2018-07-30 15:17:06.000000000 +0200 ++++ evolution-data-server-3.28.5/src/modules/secret-monitor/module-secret-monitor.c 2021-11-22 12:52:08.683986536 +0100 +@@ -167,7 +167,7 @@ secret_monitor_scan_secrets_thread (gpoi + g_list_free_full (list, (GDestroyNotify) g_object_unref); + + if (local_error != NULL) { +- g_warning ("%s: %s", G_STRFUNC, local_error->message); ++ e_source_registry_debug_print ("%s: %s", G_STRFUNC, local_error->message); + g_error_free (local_error); + } + +@@ -206,7 +206,7 @@ secret_monitor_scan_secrets_timeout_cb ( + g_thread_unref (thread); + + if (local_error != NULL) { +- g_warning ("%s: %s", G_STRFUNC, local_error->message); ++ e_source_registry_debug_print ("%s: %s", G_STRFUNC, local_error->message); + g_error_free (local_error); + g_object_unref (server); + } diff --git a/SPECS/evolution-data-server.spec b/SPECS/evolution-data-server.spec index b6e1ad2..36d3749 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: 17%{?dist} +Release: 19%{?dist} Group: System Environment/Libraries Summary: Backend data server for Evolution License: LGPLv2+ @@ -97,6 +97,12 @@ 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 +# RH bug #2008217 +Patch16: evolution-data-server-3.28.5-nonstandard-uuencode-encoding.patch + +# RH bug #1938533 +Patch17: evolution-data-server-3.28.5-secret-monitor-warnings.patch + ### Dependencies ### Requires: dconf @@ -231,6 +237,8 @@ the functionality of the installed %{name} package. %patch13 -p1 -b .imapx-icloud-mail %patch14 -p1 -b .cmake-variable-name-comparison %patch15 -p1 -b .calbackendfile-interval-tree-destroy +%patch16 -p1 -b .nonstandard-uuencode-encoding +%patch17 -p1 -b .secret-monitor-warnings %build @@ -492,6 +500,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_datadir}/installed-tests %changelog +* Mon Nov 22 2021 Milan Crha - 3.28.5-19 +- Resolves: #1938533 (secret-monitor: Turn runtime warnings into debug prints) + +* Thu Sep 30 2021 Milan Crha - 3.28.5-18 +- Resolves: #2008217 (Camel: Understand non-standard "Content-Transfer-Encoding: uuencode") + * 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)