From 32da9b9a0816ea4516fc8aa27accdbea557b3616 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 5 Mar 2018 11:57:54 +0100 Subject: [PATCH 01/10] Update to 3.27.92 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5606cac..21d368e 100644 --- a/.gitignore +++ b/.gitignore @@ -141,3 +141,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.27.4.tar.xz /evolution-3.27.90.tar.xz /evolution-3.27.91.tar.xz +/evolution-3.27.92.tar.xz diff --git a/evolution.spec b/evolution.spec index 8fbb068..038c130 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,7 +27,7 @@ ### Abstract ### Name: evolution -Version: 3.27.91 +Version: 3.27.92 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -505,6 +505,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{_datadir}/installed-tests %changelog +* Mon Mar 05 2018 Milan Crha - 3.27.92-1 +- Update to 3.27.92 + * Mon Feb 19 2018 Milan Crha - 3.27.91-1 - Update to 3.27.91 diff --git a/sources b/sources index 62ae2b0..7f6ebe5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.27.91.tar.xz) = d78ffb6fdcf67e177f6ffefda3543d41abfbd73dcbd8940b0680f386393ff2a9836a39d69339bdac3995f5dfcdf561d73d71d20ac27f6dea1322827b1e2168f5 +SHA512 (evolution-3.27.92.tar.xz) = 42f6ce9cca88a5358480108c296b11b27448a1d3e3fe5e25ed2c996cfcddecd0197c3d396a6f5a1777d402a51d5d39b60f333c4ea89a4257a86ec33f93eddb10 From 38e911d3f7a690b9d71f27a41c9a28d0a219871e Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 12 Mar 2018 10:28:57 +0100 Subject: [PATCH 02/10] Update to 3.28.0 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 21d368e..f3a7d27 100644 --- a/.gitignore +++ b/.gitignore @@ -142,3 +142,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.27.90.tar.xz /evolution-3.27.91.tar.xz /evolution-3.27.92.tar.xz +/evolution-3.28.0.tar.xz diff --git a/evolution.spec b/evolution.spec index 038c130..5c94517 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,13 +27,13 @@ ### Abstract ### Name: evolution -Version: 3.27.92 +Version: 3.28.0 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution -Source: http://download.gnome.org/sources/%{name}/3.27/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.28/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -505,6 +505,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{_datadir}/installed-tests %changelog +* Mon Mar 12 2018 Milan Crha - 3.28.0-1 +- Update to 3.28.0 + * Mon Mar 05 2018 Milan Crha - 3.27.92-1 - Update to 3.27.92 diff --git a/sources b/sources index 7f6ebe5..05a8544 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.27.92.tar.xz) = 42f6ce9cca88a5358480108c296b11b27448a1d3e3fe5e25ed2c996cfcddecd0197c3d396a6f5a1777d402a51d5d39b60f333c4ea89a4257a86ec33f93eddb10 +SHA512 (evolution-3.28.0.tar.xz) = 1282726e7a576cab6d78d0f9ac1d23162e4958cd9d448a3285767f7a0d8591f13cdb93435fa3b492d168f47e5d4313e36b8864fd07502da8654368e0141dd09c From 024154180f7b99ff2072e4bbfc746ee5370d24d8 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 9 Apr 2018 12:16:22 +0200 Subject: [PATCH 03/10] Update to 3.28.1 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f3a7d27..523e09a 100644 --- a/.gitignore +++ b/.gitignore @@ -143,3 +143,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.27.91.tar.xz /evolution-3.27.92.tar.xz /evolution-3.28.0.tar.xz +/evolution-3.28.1.tar.xz diff --git a/evolution.spec b/evolution.spec index 5c94517..f4c4e03 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,7 +27,7 @@ ### Abstract ### Name: evolution -Version: 3.28.0 +Version: 3.28.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -505,6 +505,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{_datadir}/installed-tests %changelog +* Mon Apr 09 2018 Milan Crha - 3.28.1-1 +- Update to 3.28.1 + * Mon Mar 12 2018 Milan Crha - 3.28.0-1 - Update to 3.28.0 diff --git a/sources b/sources index 05a8544..052d166 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.28.0.tar.xz) = 1282726e7a576cab6d78d0f9ac1d23162e4958cd9d448a3285767f7a0d8591f13cdb93435fa3b492d168f47e5d4313e36b8864fd07502da8654368e0141dd09c +SHA512 (evolution-3.28.1.tar.xz) = 8567d5c8563a30b006f9f7dae1c1b3ce76b517526730b1cef1f367f9dccf66e0dd6adc50281331839c04be344be1d60343418ad584c21219659fa547cb9656ea From 1261f6702d416041bec58d65e8ccf78737e96738 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 10 Apr 2018 12:01:24 -0700 Subject: [PATCH 04/10] Backport fix to strip closing > from URLs when linkifying --- evolution-3.28.1-angle-bracket-url.patch | 26 ++++++++++++++++++++++++ evolution.spec | 12 ++++++++--- 2 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 evolution-3.28.1-angle-bracket-url.patch diff --git a/evolution-3.28.1-angle-bracket-url.patch b/evolution-3.28.1-angle-bracket-url.patch new file mode 100644 index 0000000..2a402ff --- /dev/null +++ b/evolution-3.28.1-angle-bracket-url.patch @@ -0,0 +1,26 @@ +From 8df33a2da490f1201da01f2d959b515e3d98ae9f Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Tue, 10 Apr 2018 16:08:28 +0200 +Subject: Bug 795108 - Trailing bracket not stripped when linkifying URL inside + angle brackets + +--- + src/modules/webkit-editor/web-extension/e-editor-dom-functions.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/modules/webkit-editor/web-extension/e-editor-dom-functions.h b/src/modules/webkit-editor/web-extension/e-editor-dom-functions.h +index 071c48e..4191d2c 100644 +--- a/src/modules/webkit-editor/web-extension/e-editor-dom-functions.h ++++ b/src/modules/webkit-editor/web-extension/e-editor-dom-functions.h +@@ -31,7 +31,7 @@ + #define URL_PATTERN "((?:(?:(?:" URL_PROTOCOLS ")\\:\\/\\/)|(?:www\\.|ftp\\.))[^\\s\\/\\$\\.\\?#].[^\\s]*+)" + #define URL_PATTERN_SPACE URL_PATTERN "\\s$" + /* Taken from camel-url-scanner.c */ +-#define URL_INVALID_TRAILING_CHARS ",.:;?!-|}])\"" ++#define URL_INVALID_TRAILING_CHARS ",.:;?!-|}])\">" + + /* http://www.w3.org/TR/html5/forms.html#valid-e-mail-address */ + #define E_MAIL_PATTERN \ +-- +cgit v0.12 + diff --git a/evolution.spec b/evolution.spec index f4c4e03..d9389c6 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,13 +28,17 @@ Name: evolution Version: 3.28.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution Source: http://download.gnome.org/sources/%{name}/3.28/%{name}-%{version}.tar.xz +# Backport upstream fix for stripping closing > from URLs when linkifying +# https://git.gnome.org/browse/evolution/commit/?id=8df33a2da490f1201da01f2d959b515e3d98ae9f +Patch0: evolution-3.28.1-angle-bracket-url.patch + Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} @@ -211,8 +215,7 @@ The %{name}-tests package contains tests that can be used to verify the functionality of the installed %{name} package. %prep -%setup -q -n evolution-%{version} -#%patch01 -p1 -b .doc-e-cell-renderer-color +%autosetup -p1 -n evolution-%{version} # Remove the welcome email from Novell for inbox in src/mail/default/*/Inbox; do @@ -505,6 +508,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{_datadir}/installed-tests %changelog +* Tue Apr 10 2018 Adam Williamson - 3.28.1-2 +- Backport fix to strip closing > from URLs when linkifying (BGO#795108) + * Mon Apr 09 2018 Milan Crha - 3.28.1-1 - Update to 3.28.1 From 12411c4b7fdd60bffa1f9c551b4024fb7fb7b9f7 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 7 May 2018 10:57:40 +0200 Subject: [PATCH 05/10] Update to 3.28.2 --- .gitignore | 1 + evolution-3.28.1-angle-bracket-url.patch | 26 ------------------------ evolution.spec | 15 +++++++------- sources | 2 +- 4 files changed, 10 insertions(+), 34 deletions(-) delete mode 100644 evolution-3.28.1-angle-bracket-url.patch diff --git a/.gitignore b/.gitignore index 523e09a..557803f 100644 --- a/.gitignore +++ b/.gitignore @@ -144,3 +144,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.27.92.tar.xz /evolution-3.28.0.tar.xz /evolution-3.28.1.tar.xz +/evolution-3.28.2.tar.xz diff --git a/evolution-3.28.1-angle-bracket-url.patch b/evolution-3.28.1-angle-bracket-url.patch deleted file mode 100644 index 2a402ff..0000000 --- a/evolution-3.28.1-angle-bracket-url.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8df33a2da490f1201da01f2d959b515e3d98ae9f Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Tue, 10 Apr 2018 16:08:28 +0200 -Subject: Bug 795108 - Trailing bracket not stripped when linkifying URL inside - angle brackets - ---- - src/modules/webkit-editor/web-extension/e-editor-dom-functions.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/modules/webkit-editor/web-extension/e-editor-dom-functions.h b/src/modules/webkit-editor/web-extension/e-editor-dom-functions.h -index 071c48e..4191d2c 100644 ---- a/src/modules/webkit-editor/web-extension/e-editor-dom-functions.h -+++ b/src/modules/webkit-editor/web-extension/e-editor-dom-functions.h -@@ -31,7 +31,7 @@ - #define URL_PATTERN "((?:(?:(?:" URL_PROTOCOLS ")\\:\\/\\/)|(?:www\\.|ftp\\.))[^\\s\\/\\$\\.\\?#].[^\\s]*+)" - #define URL_PATTERN_SPACE URL_PATTERN "\\s$" - /* Taken from camel-url-scanner.c */ --#define URL_INVALID_TRAILING_CHARS ",.:;?!-|}])\"" -+#define URL_INVALID_TRAILING_CHARS ",.:;?!-|}])\">" - - /* http://www.w3.org/TR/html5/forms.html#valid-e-mail-address */ - #define E_MAIL_PATTERN \ --- -cgit v0.12 - diff --git a/evolution.spec b/evolution.spec index d9389c6..bccbfd6 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,18 +27,14 @@ ### Abstract ### Name: evolution -Version: 3.28.1 -Release: 2%{?dist} +Version: 3.28.2 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution Source: http://download.gnome.org/sources/%{name}/3.28/%{name}-%{version}.tar.xz -# Backport upstream fix for stripping closing > from URLs when linkifying -# https://git.gnome.org/browse/evolution/commit/?id=8df33a2da490f1201da01f2d959b515e3d98ae9f -Patch0: evolution-3.28.1-angle-bracket-url.patch - Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} @@ -215,7 +211,9 @@ The %{name}-tests package contains tests that can be used to verify the functionality of the installed %{name} package. %prep -%autosetup -p1 -n evolution-%{version} +%setup -q -n evolution-%{version} + +#%patch01 -p1 -b .doc-e-cell-renderer-color # Remove the welcome email from Novell for inbox in src/mail/default/*/Inbox; do @@ -508,6 +506,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{_datadir}/installed-tests %changelog +* Mon May 07 2018 Milan Crha - 3.28.2-1 +- Update to 3.28.2 + * Tue Apr 10 2018 Adam Williamson - 3.28.1-2 - Backport fix to strip closing > from URLs when linkifying (BGO#795108) diff --git a/sources b/sources index 052d166..57fc57b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.28.1.tar.xz) = 8567d5c8563a30b006f9f7dae1c1b3ce76b517526730b1cef1f367f9dccf66e0dd6adc50281331839c04be344be1d60343418ad584c21219659fa547cb9656ea +SHA512 (evolution-3.28.2.tar.xz) = 9cfb8f7c041fcfca3665ffc493dba63bc857c3e4d7bae50e1574407c0e28cebff5dd96dcd51e8035ae1d32c80fd0f696454c66333a0c5ea5ea01a9cca76e87a5 From 98c2d2eca0cd39d6e90ce215c567ed6b629ff2b4 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 18 Jun 2018 11:46:52 +0200 Subject: [PATCH 06/10] Update to 3.28.3 --- .gitignore | 1 + evolution.spec | 7 ++++--- sources | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 557803f..39ce131 100644 --- a/.gitignore +++ b/.gitignore @@ -145,3 +145,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.28.0.tar.xz /evolution-3.28.1.tar.xz /evolution-3.28.2.tar.xz +/evolution-3.28.3.tar.xz diff --git a/evolution.spec b/evolution.spec index bccbfd6..bc1f23f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,7 +27,7 @@ ### Abstract ### Name: evolution -Version: 3.28.2 +Version: 3.28.3 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -70,7 +70,6 @@ BuildRequires: yelp-tools BuildRequires: pkgconfig(atk) BuildRequires: pkgconfig(cairo-gobject) BuildRequires: pkgconfig(camel-1.2) >= %{eds_version} -BuildRequires: pkgconfig(cryptui-0.0) BuildRequires: pkgconfig(enchant) BuildRequires: pkgconfig(gail-3.0) >= %{gtk3_version} BuildRequires: pkgconfig(gcr-3) @@ -123,7 +122,6 @@ Group: Development/Libraries Summary: Development files for building against %{name} Requires: %{name} = %{version}-%{release} Requires: pkgconfig(camel-1.2) >= %{eds_version} -Requires: pkgconfig(cryptui-0.0) Requires: pkgconfig(enchant) Requires: pkgconfig(gtk+-3.0) >= %{gtk3_version} Requires: pkgconfig(gtkspell3-3.0) @@ -506,6 +504,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{_datadir}/installed-tests %changelog +* Mon Jun 18 2018 Milan Crha - 3.28.3-1 +- Update to 3.28.3 + * Mon May 07 2018 Milan Crha - 3.28.2-1 - Update to 3.28.2 diff --git a/sources b/sources index 57fc57b..7a666ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.28.2.tar.xz) = 9cfb8f7c041fcfca3665ffc493dba63bc857c3e4d7bae50e1574407c0e28cebff5dd96dcd51e8035ae1d32c80fd0f696454c66333a0c5ea5ea01a9cca76e87a5 +SHA512 (evolution-3.28.3.tar.xz) = d694d2d4e46bdedfc2d9173ba59dcdc160095347e34a1ab0b11a55a95f82513dbe26e322902895ac5208f6e2e9853d272fc4cc6373de22dedd67a0b2f7c91a81 From 1983bd49dc27abce288a467e6132b713cde7ef0e Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 16 Jul 2018 14:41:52 +0200 Subject: [PATCH 07/10] Update to 3.28.4 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 39ce131..0130fbc 100644 --- a/.gitignore +++ b/.gitignore @@ -146,3 +146,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.28.1.tar.xz /evolution-3.28.2.tar.xz /evolution-3.28.3.tar.xz +/evolution-3.28.4.tar.xz diff --git a/evolution.spec b/evolution.spec index bc1f23f..9b9d0c4 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,7 +27,7 @@ ### Abstract ### Name: evolution -Version: 3.28.3 +Version: 3.28.4 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -504,6 +504,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{_datadir}/installed-tests %changelog +* Mon Jul 16 2018 Milan Crha - 3.28.4-1 +- Update to 3.28.4 + * Mon Jun 18 2018 Milan Crha - 3.28.3-1 - Update to 3.28.3 diff --git a/sources b/sources index 7a666ed..0e4978e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.28.3.tar.xz) = d694d2d4e46bdedfc2d9173ba59dcdc160095347e34a1ab0b11a55a95f82513dbe26e322902895ac5208f6e2e9853d272fc4cc6373de22dedd67a0b2f7c91a81 +SHA512 (evolution-3.28.4.tar.xz) = d48a600acb7db0dbdb1299147c6f312c6c96ff9affe5d539fbe275cbc39ef18dfebc7d6a6b379226d1b181fbc207f4177df6b88c4a0403f99fdb687fd887a968 From f3cb602ba6254c4c840661ae11b709c3cfa6426b Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 30 Jul 2018 16:21:02 +0200 Subject: [PATCH 08/10] Update to 3.28.5 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0130fbc..e89e8ee 100644 --- a/.gitignore +++ b/.gitignore @@ -147,3 +147,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.28.2.tar.xz /evolution-3.28.3.tar.xz /evolution-3.28.4.tar.xz +/evolution-3.28.5.tar.xz diff --git a/evolution.spec b/evolution.spec index 9b9d0c4..d2d47c1 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,7 +27,7 @@ ### Abstract ### Name: evolution -Version: 3.28.4 +Version: 3.28.5 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -504,6 +504,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{_datadir}/installed-tests %changelog +* Mon Jul 30 2018 Milan Crha - 3.28.5-1 +- Update to 3.28.5 + * Mon Jul 16 2018 Milan Crha - 3.28.4-1 - Update to 3.28.4 diff --git a/sources b/sources index 0e4978e..cee944f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.28.4.tar.xz) = d48a600acb7db0dbdb1299147c6f312c6c96ff9affe5d539fbe275cbc39ef18dfebc7d6a6b379226d1b181fbc207f4177df6b88c4a0403f99fdb687fd887a968 +SHA512 (evolution-3.28.5.tar.xz) = a8c844afeefe3fd92f9414703222a514ac31f56ed9d8bafd5b04fd2e668720c665179d5bbc878c03bc4c886dc3171fbec181f12faea72bf2b144726bb13e01c7 From 96851c33ca35d10f946c9da0d81b9272162c674c Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 26 Oct 2018 14:05:22 +0200 Subject: [PATCH 09/10] Add BuildRequires/Requires for 'killall' binary With this `evolution --force-shutdown`, alias killev, will find it and will be able to stop evolution(-data-server) processes. It could look also for 'pkill', but none of these seems to be part of build root anymore. Having explicit dependency is better anyway. --- evolution.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index d2d47c1..9873880 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ Name: evolution Version: 3.28.5 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -49,6 +49,7 @@ Obsoletes: evolution-perl < %{last_evo_perl_version} ## Dependencies ### +Requires: %{_bindir}/killall Requires: evolution-data-server >= %{eds_version} Requires: gvfs Requires: gtkspell3 @@ -57,6 +58,7 @@ Requires: %{name}-langpacks = %{version}-%{release} ### Build Dependencies ### +BuildRequires: %{_bindir}/killall BuildRequires: cmake BuildRequires: gcc BuildRequires: gettext @@ -504,6 +506,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{_datadir}/installed-tests %changelog +* Fri Oct 26 2018 Milan Crha - 3.28.5-2 +- Add BuildRequires/Requires for 'killall' binary + * Mon Jul 30 2018 Milan Crha - 3.28.5-1 - Update to 3.28.5 From 31b9b16ac5b22792312e595f2262c7a8efc5e800 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 18 Feb 2019 12:44:32 +0100 Subject: [PATCH 10/10] Resolves: #1677651 (CVE-2018-15587 reposition signature bar) --- ...-2018-15587-reposition-signature-bar.patch | 80 +++++++++++++++++++ evolution.spec | 11 ++- 2 files changed, 87 insertions(+), 4 deletions(-) create mode 100644 evolution-3.28.5-cve-2018-15587-reposition-signature-bar.patch diff --git a/evolution-3.28.5-cve-2018-15587-reposition-signature-bar.patch b/evolution-3.28.5-cve-2018-15587-reposition-signature-bar.patch new file mode 100644 index 0000000..178c17e --- /dev/null +++ b/evolution-3.28.5-cve-2018-15587-reposition-signature-bar.patch @@ -0,0 +1,80 @@ +diff -up evolution-3.28.5/src/em-format/e-mail-parser.c.cve-2018-15587-reposition-signature-bar evolution-3.28.5/src/em-format/e-mail-parser.c +--- evolution-3.28.5/src/em-format/e-mail-parser.c.cve-2018-15587-reposition-signature-bar 2018-07-30 15:37:05.000000000 +0200 ++++ evolution-3.28.5/src/em-format/e-mail-parser.c 2019-02-18 12:14:59.352466607 +0100 +@@ -79,6 +79,67 @@ GType e_mail_parser_application_smime_ge + static gpointer parent_class; + + static void ++mail_parser_move_security_before_headers (GQueue *part_queue) ++{ ++ GList *link, *last_headers = NULL; ++ GSList *headers_stack = NULL; ++ ++ link = g_queue_peek_head_link (part_queue); ++ while (link) { ++ EMailPart *part = link->data; ++ const gchar *id; ++ ++ if (!part) { ++ link = g_list_next (link); ++ continue; ++ } ++ ++ id = e_mail_part_get_id (part); ++ if (!id) { ++ link = g_list_next (link); ++ continue; ++ } ++ ++ if (g_str_has_suffix (id, ".rfc822")) { ++ headers_stack = g_slist_prepend (headers_stack, last_headers); ++ last_headers = NULL; ++ } else if (g_str_has_suffix (id, ".rfc822.end")) { ++ g_warn_if_fail (headers_stack != NULL); ++ ++ if (headers_stack) { ++ last_headers = headers_stack->data; ++ headers_stack = g_slist_remove (headers_stack, last_headers); ++ } else { ++ last_headers = NULL; ++ } ++ } ++ ++ if (g_strcmp0 (e_mail_part_get_mime_type (part), "application/vnd.evolution.headers") == 0) { ++ last_headers = link; ++ link = g_list_next (link); ++ } else if (g_strcmp0 (e_mail_part_get_mime_type (part), "application/vnd.evolution.secure-button") == 0) { ++ g_warn_if_fail (last_headers != NULL); ++ ++ if (last_headers) { ++ GList *next = g_list_next (link); ++ ++ g_warn_if_fail (g_queue_remove (part_queue, part)); ++ g_queue_insert_before (part_queue, last_headers, part); ++ ++ link = next; ++ } else { ++ link = g_list_next (link); ++ } ++ } else { ++ link = g_list_next (link); ++ } ++ } ++ ++ g_warn_if_fail (headers_stack == NULL); ++ g_slist_free (headers_stack); ++} ++ ++static void + mail_parser_run (EMailParser *parser, + EMailPartList *part_list, + GCancellable *cancellable) +@@ -132,6 +193,8 @@ mail_parser_run (EMailParser *parser, + break; + } + ++ mail_parser_move_security_before_headers (&mail_part_queue); ++ + while (!g_queue_is_empty (&mail_part_queue)) { + mail_part = g_queue_pop_head (&mail_part_queue); + e_mail_part_list_add_part (part_list, mail_part); diff --git a/evolution.spec b/evolution.spec index 9873880..a9fd13e 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ Name: evolution Version: 3.28.5 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -44,8 +44,8 @@ Obsoletes: evolution-perl < %{last_evo_perl_version} ### Patches ### -# RH bug # -#Patch01: evolution-3.17.1-doc-e-cell-renderer-color.patch +# RH bug #1677651 +Patch01: evolution-3.28.5-cve-2018-15587-reposition-signature-bar.patch ## Dependencies ### @@ -213,7 +213,7 @@ the functionality of the installed %{name} package. %prep %setup -q -n evolution-%{version} -#%patch01 -p1 -b .doc-e-cell-renderer-color +%patch01 -p1 -b .cve-2018-15587-reposition-signature-bar # Remove the welcome email from Novell for inbox in src/mail/default/*/Inbox; do @@ -506,6 +506,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{_datadir}/installed-tests %changelog +* Mon Feb 18 2019 Milan Crha - 3.28.5-3 +- Add patch for RH bug #1677651 (CVE-2018-15587 reposition signature bar) + * Fri Oct 26 2018 Milan Crha - 3.28.5-2 - Add BuildRequires/Requires for 'killall' binary