diff --git a/evolution-data-server-3.40.0-ssl-trust-sha1-fallback.patch b/evolution-data-server-3.40.0-ssl-trust-sha1-fallback.patch deleted file mode 100644 index 92d91b9..0000000 --- a/evolution-data-server-3.40.0-ssl-trust-sha1-fallback.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/libedataserver/e-source-webdav.c b/src/libedataserver/e-source-webdav.c -index 657d41da2..c4762895e 100644 ---- a/src/libedataserver/e-source-webdav.c -+++ b/src/libedataserver/e-source-webdav.c -@@ -1520,7 +1520,12 @@ e_source_webdav_verify_ssl_trust (ESourceWebdav *extension, - if (decode_ssl_trust (extension, &response, &old_host, &old_hash)) { - gchar *hash; - -- hash = g_compute_checksum_for_data (G_CHECKSUM_SHA256, bytes->data, bytes->len); -+ /* This is required for Flatpak, which can be built with eds before the 3.40, where -+ had been changed to use SHA256. */ -+ if (old_hash && strlen (old_hash) == g_checksum_type_get_length (G_CHECKSUM_SHA1) * 2) -+ hash = g_compute_checksum_for_data (G_CHECKSUM_SHA1, bytes->data, bytes->len); -+ else -+ hash = g_compute_checksum_for_data (G_CHECKSUM_SHA256, bytes->data, bytes->len); - - if (response != E_TRUST_PROMPT_RESPONSE_UNKNOWN && - g_strcmp0 (old_host, host) == 0 && diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 78dadde..50d13fb 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -53,15 +53,13 @@ ### Abstract ### Name: evolution-data-server -Version: 3.40.0 -Release: 3%{?dist} +Version: 3.40.1 +Release: 1%{?dist} Summary: Backend data server for Evolution License: LGPLv2+ URL: https://wiki.gnome.org/Apps/Evolution Source: http://download.gnome.org/sources/%{name}/3.40/%{name}-%{version}.tar.xz -Patch01: evolution-data-server-3.40.0-ssl-trust-sha1-fallback.patch - Provides: evolution-webcal = %{version} Obsoletes: evolution-webcal < 2.24.0 @@ -477,6 +475,9 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \; %{_datadir}/installed-tests %changelog +* Fri Apr 30 2021 Milan Crha - 3.40.1-1 +- Update to 3.40.1 + * Mon Mar 29 2021 Milan Crha - 3.40.0-3 - Resolves: #1943818 (ESourceWebDAV: Fallback to SHA1 on SSL trust verification if needed) diff --git a/sources b/sources index e3a0ff4..0d1a87a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-data-server-3.40.0.tar.xz) = d31ef0d270ef64909150c0e087835bb6308125155664eee3375be6a59c9c43cd251e9617adbf819846a7d9bb73309ec51699159ee06465266193ad5dea3c0a00 +SHA512 (evolution-data-server-3.40.1.tar.xz) = 47964a0965d412c329743423483c6694d078835b375d457aabe7e45a2b1b3406e4e0d4c1b855460f3c9b327d4d9320e659b0e43243816ec1e9bc49d0fea90f7d