pool/evolution-data-server
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 617553 from GNOME:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/617553
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution-data-server?expand=0&rev=192
This commit is contained in:
Yuchen Lin 2018-06-22 11:27:58 +00:00 committed by Git OBS Bridge
commit 5ce8f423f5
6 changed files with 30 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
eds-correct-some-public-headers.patch
View File

@ -1,46 +0,0 @@
From 3d7ee164c1c598f302729e0bd24a86418f245f2c Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Thu, 26 Apr 2018 13:37:32 +0200
Subject: Correct some public headers in libedataserverui
---
src/libedataserverui/e-trust-prompt.h | 4 ++++
src/libedataserverui/e-webdav-discover-widget.h | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/libedataserverui/e-trust-prompt.h b/src/libedataserverui/e-trust-prompt.h
index 7f289cb..657775e 100644
--- a/src/libedataserverui/e-trust-prompt.h
+++ b/src/libedataserverui/e-trust-prompt.h
@@ -29,6 +29,8 @@
#include <libedataserver/libedataserver.h>
+G_BEGIN_DECLS
+
gchar * e_trust_prompt_describe_certificate_errors
(GTlsCertificateFlags flags);
ETrustPromptResponse
@@ -56,4 +58,6 @@ gboolean e_trust_prompt_run_for_source_finish
ETrustPromptResponse *response,
GError **error);
+G_END_DECLS
+
#endif /* E_TRUST_PROMPT_H */
diff --git a/src/libedataserverui/e-webdav-discover-widget.h b/src/libedataserverui/e-webdav-discover-widget.h
index fdb7ee2..e324026 100644
--- a/src/libedataserverui/e-webdav-discover-widget.h
+++ b/src/libedataserverui/e-webdav-discover-widget.h
@@ -27,7 +27,7 @@
#include <gtk/gtk.h>
#include <libedataserver/libedataserver.h>
-#include <libedataserverui/libedataserverui.h>
+#include <libedataserverui/e-credentials-prompter.h>
G_BEGIN_DECLS
--
cgit v0.12

74
eds-fix-fails-to-parse-Google-OAuth2.patch
View File

@ -1,74 +0,0 @@
From 5c6b22b8eb72ccac07c7e5867aa6074347f7fd78 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Thu, 10 May 2018 13:58:32 +0200
Subject: Bug 795997 - Fails to parse Google OAuth2 authorization code
---
src/libedataserver/e-oauth2-service-google.c | 49 +++++++++++++++++++++++-----
1 file changed, 41 insertions(+), 8 deletions(-)
diff --git a/src/libedataserver/e-oauth2-service-google.c b/src/libedataserver/e-oauth2-service-google.c
index 261ba06..c380c61 100644
--- a/src/libedataserver/e-oauth2-service-google.c
+++ b/src/libedataserver/e-oauth2-service-google.c
@@ -119,16 +119,49 @@ eos_google_extract_authorization_code (EOAuth2Service *service,
*out_authorization_code = NULL;
- if (!page_title || !*page_title)
- return FALSE;
+ if (page_title && *page_title) {
+ /* Known response, but no authorization code */
+ if (g_ascii_strncasecmp (page_title, "Denied ", 7) == 0)
+ return TRUE;
+
+ if (g_ascii_strncasecmp (page_title, "Success code=", 13) == 0) {
+ *out_authorization_code = g_strdup (page_title + 13);
+ return TRUE;
+ }
+ }
+
+ if (page_uri && *page_uri) {
+ SoupURI *suri;
+
+ suri = soup_uri_new (page_uri);
+ if (suri) {
+ const gchar *query = soup_uri_get_query (suri);
+ gboolean known = FALSE;
+
+ if (query && *query) {
+ GHashTable *params;
+
+ params = soup_form_decode (query);
+ if (params) {
+ const gchar *response;
+
+ response = g_hash_table_lookup (params, "response");
+ if (response && g_ascii_strncasecmp (response, "code=", 5) == 0) {
+ *out_authorization_code = g_strdup (response + 5);
+ known = TRUE;
+ } else if (response && g_ascii_strncasecmp (response, "error", 5) == 0) {
+ known = TRUE;
+ }
+
+ g_hash_table_destroy (params);
+ }
+ }
- /* Known response, but no authorization code */
- if (g_ascii_strncasecmp (page_title, "Denied ", 7) == 0)
- return TRUE;
+ soup_uri_free (suri);
- if (g_ascii_strncasecmp (page_title, "Success code=", 13) == 0) {
- *out_authorization_code = g_strdup (page_title + 13);
- return TRUE;
+ if (known)
+ return TRUE;
+ }
}
return FALSE;
--
cgit v0.12

3
evolution-data-server-3.28.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:531a790182dc6b6b2d0421feb34489c7ddf5cc807e9cffbb87461d13e047f3ab
size 4447268

3
evolution-data-server-3.28.3.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:437e91f03fe49bf531416d30828e943aa2c74d657aeb44fb637997104a3a5887
size 4452080

26
evolution-data-server.changes
View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Mon Jun 18 09:37:48 UTC 2018 - bjorn.lie@gmail.com
- Update to version 3.28.3:
+ Address some of the clang warnings.
+ Correct some public headers in libedataserverui.
+ Address some of the compiler and static analyzers warnings.
+ [module-secret-monitor] Correct runtime warning from
secret_service_search_sync().
+ Check for ICAL_STATUS_DELETED status enum value.
+ Correct find_program() for python with multiple names.
+ Silently skip empty lines when reading autoconfig-variables.
+ Update bug URL and switch to https:// in the DOAP file.
+ Google's "Daily Limit Exceeded" error not always propagated
into UI.
+ [CalDAV] Race condition on connection object.
+ Correct false runtime warning from camel_folder_info_build().
+ Bugs fixed: bgo#795997, bgo#796206, bgo#796115, bgo#796116,
bgo#796281, bgo#763029, bgo#792610,
glgo#GNOME/evolution-data-server#2,
glgo#GNOME/evolution-data-server#4.
+ Updated translations.
- Drop upstream fixed/applied patches:
+ eds-fix-fails-to-parse-Google-OAuth2.patch.
+ eds-correct-some-public-headers.patch.
-------------------------------------------------------------------
Wed May 16 20:36:25 UTC 2018 - bjorn.lie@gmail.com

6
evolution-data-server.spec
View File

@ -30,7 +30,7 @@
%define so_edata_cal 28
%define _evo_version 3.28
Name: evolution-data-server
Version: 3.28.2
Version: 3.28.3
Release: 0
Summary: Evolution Data Server
License: LGPL-2.1-or-later
@ -38,10 +38,6 @@ Group: Development/Libraries/GNOME
URL: https://wiki.gnome.org/Apps/Evolution
Source0: http://download.gnome.org/sources/evolution-data-server/%{_evo_version}/%{name}-%{version}.tar.xz
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM eds-fix-fails-to-parse-Google-OAuth2.patch bgo#795997 -- Fix fails to parse Google OAuth2 authorization code
Patch0: eds-fix-fails-to-parse-Google-OAuth2.patch
# PATCH-FIX-UPSTREAM eds-correct-some-public-headers.patch -- Correct some public headers in libedataserverui
Patch1: eds-correct-some-public-headers.patch
BuildRequires: cmake
BuildRequires: db-devel