From 812dafcea63317fedc0e8b76dd0731ba1aa7312b17821944f7c3fa40c9d13c4c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 24 Mar 2021 16:31:05 +0000 Subject: [PATCH] Accepting request 880927 from GNOME:Next GNOME 40 - here we come OBS-URL: https://build.opensuse.org/request/show/880927 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-data-server?expand=0&rev=391 --- baselibs.conf | 4 +- evolution-data-server-3.38.4.tar.xz | 3 - evolution-data-server-3.40.0.tar.xz | 3 + evolution-data-server-boo1182882.patch | 52 ------------ evolution-data-server.changes | 113 ++++++++++++++++++++++++- evolution-data-server.spec | 13 ++- 6 files changed, 122 insertions(+), 66 deletions(-) delete mode 100644 evolution-data-server-3.38.4.tar.xz create mode 100644 evolution-data-server-3.40.0.tar.xz delete mode 100644 evolution-data-server-boo1182882.patch diff --git a/baselibs.conf b/baselibs.conf index ad7ec6d..4f84b2c 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -6,5 +6,5 @@ libebook-contacts-1_2-3 libecal-2_0-1 libedata-book-1_2-26 libedata-cal-2_0-1 -libedataserver-1_2-25 -libedataserverui-1_2-2 +libedataserver-1_2-26 +libedataserverui-1_2-3 diff --git a/evolution-data-server-3.38.4.tar.xz b/evolution-data-server-3.38.4.tar.xz deleted file mode 100644 index a772027..0000000 --- a/evolution-data-server-3.38.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac53f16b2d51f3e7ff8025f9ca19f4a2d4ce3841d72ae9fe2bb897dc8099d705 -size 4663372 diff --git a/evolution-data-server-3.40.0.tar.xz b/evolution-data-server-3.40.0.tar.xz new file mode 100644 index 0000000..e7b697a --- /dev/null +++ b/evolution-data-server-3.40.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed572f0cb6a2365809943449a8ccbee652681e2d9a1a7f4a54b60cbb53d87445 +size 4623568 diff --git a/evolution-data-server-boo1182882.patch b/evolution-data-server-boo1182882.patch deleted file mode 100644 index 733aa2b..0000000 --- a/evolution-data-server-boo1182882.patch +++ /dev/null @@ -1,52 +0,0 @@ -From b0731961dca6ca2ee4a11b708545d58ff4948093 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Tue, 2 Mar 2021 12:26:09 +0100 -Subject: [PATCH] Allocate large-enough buffer for g_base64_decode_step() - ---- - src/camel/camel-mime-filter-basic.c | 8 ++------ - src/camel/camel-mime-utils.c | 2 +- - 2 files changed, 3 insertions(+), 7 deletions(-) - -diff --git a/src/camel/camel-mime-filter-basic.c b/src/camel/camel-mime-filter-basic.c -index b13276264..8187fabd4 100644 ---- a/src/camel/camel-mime-filter-basic.c -+++ b/src/camel/camel-mime-filter-basic.c -@@ -83,8 +83,7 @@ mime_filter_basic_filter (CamelMimeFilter *mime_filter, - g_return_if_fail (newlen <= (len + 2) * 2 + 62); - break; - case CAMEL_MIME_FILTER_BASIC_BASE64_DEC: -- /* output can't possibly exceed the input size */ -- camel_mime_filter_set_size (mime_filter, len + 3, FALSE); -+ camel_mime_filter_set_size (mime_filter, (len * 3 / 4) + 3, FALSE); - newlen = g_base64_decode_step ( - in, len, - (guchar *) mime_filter->outbuf, -@@ -225,10 +224,7 @@ mime_filter_basic_complete (CamelMimeFilter *mime_filter, - g_return_if_fail (newlen <= (len + 2) * 2 + 62); - break; - case CAMEL_MIME_FILTER_BASIC_BASE64_DEC: -- /* Output can't possibly exceed the input size, but add 1, -- to make sure the mime_filter->outbuf will not be NULL, -- in case the input stream is empty. */ -- camel_mime_filter_set_size (mime_filter, len + 1, FALSE); -+ camel_mime_filter_set_size (mime_filter, (len * 3 / 4) + 3, FALSE); - newlen = g_base64_decode_step ( - in, len, - (guchar *) mime_filter->outbuf, -diff --git a/src/camel/camel-mime-utils.c b/src/camel/camel-mime-utils.c -index 3394707e2..31024f5d4 100644 ---- a/src/camel/camel-mime-utils.c -+++ b/src/camel/camel-mime-utils.c -@@ -1186,7 +1186,7 @@ rfc2047_decode_word (const gchar *in, - case 'B': - case 'b': - inptr += 2; -- decoded = g_alloca (inend - inptr); -+ decoded = g_alloca (((inend - inptr) * 3 / 4) + 3); - declen = g_base64_decode_step ((gchar *) inptr, inend - inptr, decoded, &state, &save); - break; - case 'Q': --- -2.30.1 - diff --git a/evolution-data-server.changes b/evolution-data-server.changes index 23445c5..577063a 100644 --- a/evolution-data-server.changes +++ b/evolution-data-server.changes @@ -1,9 +1,118 @@ ------------------------------------------------------------------- -Wed Mar 3 21:08:31 UTC 2021 - Michael Gorse +Sat Mar 20 08:25:38 UTC 2021 - Michael Gorse + +- Update to version 3.40.0: + + Updated translations. + +------------------------------------------------------------------- +Thu Mar 18 13:19:44 UTC 2021 - Dominique Leuenberger + +- Update to version 3.39.3: + + ESoupAuthBearer: Shorten the token expiry time by 4 more + seconds. + + ESoupSession: Refresh Bearer auth token during request + redirect. + + MetaBackend tests: Relax a runtime requirement. + + Calendar: Add functions to clamp a VTIMEZONE component. + + e_cal_client_get_component_as_string: Clamp the VTIMEZONE + component. + + test-cal-utils: Add test to clamp a VTIMEZONE by a future time. + + Calendar: Make few improvements in the Weather backend. + + camel-debug: Copy cached backtrace symbol strings. + + camel-gpg-context: Add some debug prints. + + [IMAPx] Cancel authentication request when failed to get the + SASL response. + + EBookMetaBackend: Add 'backend_module_directory' property into + the class. + + Allow to load modules from custom prefixes. + + reminder-watcher: Process "Dismiss All" requests in the + background. + + Allocate large-enough buffer for g_base64_decode_step(). + + CamelSpoolStore: Use cache for often accessed data. + + alarm-notify: Default notify-past-events to false plus few + related fixes. + + e-book-backend-file: Fix busy loop when modifying multiple + contacts at once. + + Use SHA256 instead of SHA1 where appropriate. + + Fix integer overflow on 32-bit architectures. + + Fix a memory leak in camel_util_get_directory_variants(). + + Updated translations. +- Drop evolution-data-server-boo1182882.patch: fixed upstream. + +------------------------------------------------------------------- +Wed Mar 3 21:05:06 UTC 2021 - Michael Gorse - Add evolution-data-server-boo1182882.patch: fix buffer overrun when parsing base64 data (boo#1182882). +------------------------------------------------------------------- +Mon Feb 15 10:48:23 UTC 2021 - Callum Farmer + +- Update to version 3.39.2: + + Use default OAuth2 services on scratch sources. + + CamelNetworkSettings: Unset default value for the 'user' + property. + + Adapt to libgweather 40.alpha API changes. + + IMAPx: Ignore unexpected untagged LIST/LSUB responses. + + Calendar: Use ACKNOWLEDGED VALARM property. + + CamelMime*: Annotate the data arrays with element-type uint8. + + CalDAV: Support calendar-order property. + + Flatpak: Share NSS database with the system. + + e_xml_is_element_name: Can fail to match a namespaced node. + + Camel: Conversion between UTF-8 and UTF-7 misbehaves for emoji. + + vala: Make webdav_discover_sources E.Source methods. + + Fix variable reference in + e_source_mail_identity_set_signature_uid docs. + + Correct typos in a/an. +- Bump so_edataserver to 26, so_edataserverui to 3, following + upstream (also in baselibs.conf). + +------------------------------------------------------------------- +Mon Feb 15 03:39:02 UTC 2021 - Dominique Leuenberger + +- Require libgdata-devel by evolution-data-server-devel when + introspection support is enabled: + + libedataserver-1.2.deps specifies a dependency on libgdata. + +------------------------------------------------------------------- +Mon Feb 15 03:39:01 UTC 2021 - Dominique Leuenberger + +- Update to version 3.39.1: + + Addressbook:file backend: Prevent percent letter in photo + filename. + + Bump gtk+ requirement to 3.16, due to used functions from that + version. + + CalComponentParameterBag: The take method gives the ownership + of the object. + + CalComponentPropertyBag: The take method gives the ownership of + the object. + + Calendar: + - Fix a possible leak in e_cal_util_parse_ics_string(). + - Make it possible to assign email address to On This Computer + sources. + + Camel: Special-case search for the match of the MESSAGE-ID + headers. + + CamelMimeFilterToHTML: Change how empty
is recognized. + + DataCalView: Created objects could be notified twice. + + EBook/CalBackend: Correct free function for the + pending_operations queue. + + EBufferTagger: Derive link color from the theme. + + EReminderWatcher: + - Catch a race condition when creating a calendar view. + - Default alarm range should be from the day begin. + + GLibTools.cmake: Generate signal marshallers without source + reference. + + Introduce e_async_closure_new_with_context(). + + Mark a missed user-visible text for translation. + + ReminderWatcher: Add detailed debug prints about the scheduled + reminders. + + Vala: Mark the message field of CamelFolderThreadNode as + nullable. + + alarm-notify: Provide application reference in canberra calls. + + e-categories: Show migration runtime warning only if the file + exists. + + Updated translations. + ------------------------------------------------------------------- Fri Feb 12 17:08:42 UTC 2021 - Bjørn Lie @@ -138,7 +247,7 @@ Fri May 29 19:39:53 UTC 2020 - Bjørn Lie glgo#GNOME/evolution-data-server#212, glgo#GNOME/evolution-data-server#213, glgo#GNOME/evolution-data-server#219, - glgo#GNOME/evolution#915. + glgo#GNOME/evolution#915. ------------------------------------------------------------------- Sat Apr 25 17:48:37 UTC 2020 - Bjørn Lie diff --git a/evolution-data-server.spec b/evolution-data-server.spec index bee5ef7..0e5a156 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -22,8 +22,8 @@ # When updating the sonums, do not forget to also update baselibs.conf %define so_camel 62 %define so_ebackend 10 -%define so_edataserver 25 -%define so_edataserverui 2 +%define so_edataserver 26 +%define so_edataserverui 3 %define so_ebook 20 %define so_ebook_contacts 3 %define so_edata_book 26 @@ -32,16 +32,14 @@ %bcond_without introspection Name: evolution-data-server -Version: 3.38.4 +Version: 3.40.0 Release: 0 Summary: Evolution Data Server License: LGPL-2.0-only Group: Development/Libraries/GNOME URL: https://wiki.gnome.org/Apps/Evolution -Source0: https://download.gnome.org/sources/evolution-data-server/3.38/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/evolution-data-server/3.40/%{name}-%{version}.tar.xz Source99: baselibs.conf -# PATCH-FIX-UPSTREAM evolution-data-server-boo1182882.patch boo#1182882 mgorse@suse.com -- fix buffer overrun when decoding base64 data. -Patch0: evolution-data-server-boo1182882.patch BuildRequires: cmake BuildRequires: db-devel @@ -69,7 +67,7 @@ BuildRequires: translation-update-upstream BuildRequires: vala >= 0.22.0 BuildRequires: pkgconfig(gcr-base-3) >= 3.4 BuildRequires: pkgconfig(goa-1.0) >= 3.8 -BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(gtk+-3.0) >= 3.16 BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(json-glib-1.0) >= 1.0.4 BuildRequires: pkgconfig(libcanberra-gtk3) >= 0.25 @@ -278,6 +276,7 @@ Requires: libedataserver-1_2-%{so_edataserver} = %{version} Requires: libedataserverui-1_2-%{so_edataserverui} = %{version} Requires: openldap2-devel %if %{?with_introspection} +Requires: libgdata-devel Requires: typelib-1_0-Camel-1_2 = %{version} Requires: typelib-1_0-EBook-1_2 = %{version} Requires: typelib-1_0-EBookContacts-1_2 = %{version}